diff -Naur ns-3.17/AUTHORS ns-3.18/AUTHORS
--- ns-3.17/AUTHORS 2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/AUTHORS 2013-10-26 07:07:30.615364408 -0700
@@ -2,6 +2,7 @@
Rohit Agarwal (mindprince@gmail.com)
Kirill Andreev (andreev@iitp.ru)
Dean Armstrong (deanarm@gmail.com)
+Ghada Badawy (gbadawy@gmail.com)
Nicola Baldo (nbaldo@cttc.es)
Mirko Banchi (mk.banchi@gmail.com)
Peter D. Barnes, Jr. (barnes26@llnl.gov)
@@ -27,6 +28,7 @@
Craig Dowell (craigdo@ee.washington.edu)
Denis Fakhriev (fakhriev@iitp.ru)
Jahanzeb Farooq (Jahanzeb.Farooq@inria.fr, Jahanzeb.Farooq@gmail.com)
+Pedro Fortuna (pedro.fortuna@inescporto.pt)
Juliana Freitag Borin (juliana.freitag@gmail.com)
Eric Gamess (egamess@gmail.com)
Thomas Geithner (thomas.geithner@dai-labor.de)
diff -Naur ns-3.17/bindings/python/ns3modulegen_core_customizations.py ns-3.18/bindings/python/ns3modulegen_core_customizations.py
--- ns-3.17/bindings/python/ns3modulegen_core_customizations.py 2013-05-12 09:50:15.000000000 -0700
+++ ns-3.18/bindings/python/ns3modulegen_core_customizations.py 2013-10-26 07:07:30.615364408 -0700
@@ -177,8 +177,11 @@
}
virtual ~%s()
{
+ PyGILState_STATE __py_gil_state;
+ __py_gil_state = (PyEval_ThreadsInitialized() ? PyGILState_Ensure() : (PyGILState_STATE) 0);
Py_DECREF(m_callback);
m_callback = NULL;
+ PyGILState_Release(__py_gil_state);
}
virtual bool IsEqual(ns3::Ptr
+ CommandLine cmd; + cmd.Parse (argc, argv); +... + + std::cerr << cmd; ++or +
+ cmd.PrintHelp (std::cerr); ++