diff -r 3f0d3324cbc5 -r 651f74728160 src/olsr/bindings/modulegen__gcc_ILP32.py
--- a/src/olsr/bindings/modulegen__gcc_ILP32.py	Thu Mar 31 12:58:05 2011 +0200
+++ b/src/olsr/bindings/modulegen__gcc_ILP32.py	Thu Mar 31 17:47:20 2011 +0100
@@ -132,14 +132,6 @@
     module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase'])
     ## tag-buffer.h (module 'network'): ns3::TagBuffer [class]
     module.add_class('TagBuffer', import_from_module='ns.network')
-    ## test.h (module 'core'): ns3::TestCase [class]
-    module.add_class('TestCase', allow_subclassing=True, import_from_module='ns.core')
-    ## test.h (module 'core'): ns3::TestRunner [class]
-    module.add_class('TestRunner', import_from_module='ns.core')
-    ## test.h (module 'core'): ns3::TestSuite [class]
-    module.add_class('TestSuite', allow_subclassing=True, import_from_module='ns.core')
-    ## test.h (module 'core'): ns3::TestSuite::TestType [enumeration]
-    module.add_enum('TestType', ['BVT', 'UNIT', 'SYSTEM', 'EXAMPLE', 'PERFORMANCE'], outer_class=root_module['ns3::TestSuite'], import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time [class]
     module.add_class('Time', import_from_module='ns.core')
     ## nstime.h (module 'core'): ns3::Time::Unit [enumeration]
@@ -448,9 +440,6 @@
     register_Ns3SystemWallClockMs_methods(root_module, root_module['ns3::SystemWallClockMs'])
     register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
     register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
-    register_Ns3TestCase_methods(root_module, root_module['ns3::TestCase'])
-    register_Ns3TestRunner_methods(root_module, root_module['ns3::TestRunner'])
-    register_Ns3TestSuite_methods(root_module, root_module['ns3::TestSuite'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3Timer_methods(root_module, root_module['ns3::Timer'])
     register_Ns3TimerImpl_methods(root_module, root_module['ns3::TimerImpl'])
@@ -2508,285 +2497,6 @@
                    [param('uint8_t', 'v')])
     return
 
-def register_Ns3TestCase_methods(root_module, cls):
-    ## test.h (module 'core'): ns3::TestCase::TestCase(std::string name) [constructor]
-    cls.add_constructor([param('std::string', 'name')])
-    ## test.h (module 'core'): void ns3::TestCase::Run() [member function]
-    cls.add_method('Run', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::SetVerbose(bool verbose) [member function]
-    cls.add_method('SetVerbose', 
-                   'void', 
-                   [param('bool', 'verbose')])
-    ## test.h (module 'core'): void ns3::TestCase::SetContinueOnFailure(bool continueOnFailure) [member function]
-    cls.add_method('SetContinueOnFailure', 
-                   'void', 
-                   [param('bool', 'continueOnFailure')])
-    ## test.h (module 'core'): void ns3::TestCase::SetName(std::string name) [member function]
-    cls.add_method('SetName', 
-                   'void', 
-                   [param('std::string', 'name')])
-    ## test.h (module 'core'): std::string ns3::TestCase::GetName() [member function]
-    cls.add_method('GetName', 
-                   'std::string', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::SetBaseDir(std::string dir) [member function]
-    cls.add_method('SetBaseDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h (module 'core'): std::string ns3::TestCase::GetBaseDir() [member function]
-    cls.add_method('GetBaseDir', 
-                   'std::string', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::SetTempDir(std::string dir) [member function]
-    cls.add_method('SetTempDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h (module 'core'): std::string ns3::TestCase::GetTempDir() [member function]
-    cls.add_method('GetTempDir', 
-                   'std::string', 
-                   [])
-    ## test.h (module 'core'): std::string ns3::TestCase::GetSourceDir(std::string file) [member function]
-    cls.add_method('GetSourceDir', 
-                   'std::string', 
-                   [param('std::string', 'file')])
-    ## test.h (module 'core'): void ns3::TestCase::SetStream(std::ofstream * ofs) [member function]
-    cls.add_method('SetStream', 
-                   'void', 
-                   [param('std::ofstream *', 'ofs')])
-    ## test.h (module 'core'): std::ofstream * ns3::TestCase::GetStream() [member function]
-    cls.add_method('GetStream', 
-                   'std::ofstream *', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::UpdateErrorStatus(bool error) [member function]
-    cls.add_method('UpdateErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h (module 'core'): void ns3::TestCase::SetErrorStatus(bool error) [member function]
-    cls.add_method('SetErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h (module 'core'): bool ns3::TestCase::GetErrorStatus() [member function]
-    cls.add_method('GetErrorStatus', 
-                   'bool', 
-                   [])
-    ## test.h (module 'core'): bool ns3::TestCase::ContinueOnFailure() [member function]
-    cls.add_method('ContinueOnFailure', 
-                   'bool', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::ReportStart() [member function]
-    cls.add_method('ReportStart', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::ReportCaseSuccess() [member function]
-    cls.add_method('ReportCaseSuccess', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::ReportCaseFailure() [member function]
-    cls.add_method('ReportCaseFailure', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::ReportTestFailure(std::string cond, std::string actual, std::string limit, std::string message, std::string file, int32_t line) [member function]
-    cls.add_method('ReportTestFailure', 
-                   'void', 
-                   [param('std::string', 'cond'), param('std::string', 'actual'), param('std::string', 'limit'), param('std::string', 'message'), param('std::string', 'file'), param('int32_t', 'line')])
-    ## test.h (module 'core'): void ns3::TestCase::ReportEnd() [member function]
-    cls.add_method('ReportEnd', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestCase::DoReportStart() [member function]
-    cls.add_method('DoReportStart', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestCase::DoReportCaseSuccess() [member function]
-    cls.add_method('DoReportCaseSuccess', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestCase::DoReportCaseFailure() [member function]
-    cls.add_method('DoReportCaseFailure', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestCase::DoReportTestFailure(std::string cond, std::string actual, std::string limit, std::string message, std::string file, int32_t line) [member function]
-    cls.add_method('DoReportTestFailure', 
-                   'void', 
-                   [param('std::string', 'cond'), param('std::string', 'actual'), param('std::string', 'limit'), param('std::string', 'message'), param('std::string', 'file'), param('int32_t', 'line')], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestCase::DoReportEnd() [member function]
-    cls.add_method('DoReportEnd', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestCase::DoSetup() [member function]
-    cls.add_method('DoSetup', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestCase::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestCase::DoTeardown() [member function]
-    cls.add_method('DoTeardown', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    return
-
-def register_Ns3TestRunner_methods(root_module, cls):
-    ## test.h (module 'core'): ns3::TestRunner::TestRunner() [constructor]
-    cls.add_constructor([])
-    ## test.h (module 'core'): ns3::TestRunner::TestRunner(ns3::TestRunner const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TestRunner const &', 'arg0')])
-    ## test.h (module 'core'): static uint32_t ns3::TestRunner::AddTestSuite(ns3::TestSuite * testSuite) [member function]
-    cls.add_method('AddTestSuite', 
-                   'uint32_t', 
-                   [param('ns3::TestSuite *', 'testSuite')], 
-                   is_static=True)
-    ## test.h (module 'core'): static uint32_t ns3::TestRunner::GetNTestSuites() [member function]
-    cls.add_method('GetNTestSuites', 
-                   'uint32_t', 
-                   [], 
-                   is_static=True)
-    ## test.h (module 'core'): static ns3::TestSuite * ns3::TestRunner::GetTestSuite(uint32_t n) [member function]
-    cls.add_method('GetTestSuite', 
-                   'ns3::TestSuite *', 
-                   [param('uint32_t', 'n')], 
-                   is_static=True)
-    return
-
-def register_Ns3TestSuite_methods(root_module, cls):
-    ## test.h (module 'core'): ns3::TestSuite::TestSuite(std::string name, ns3::TestSuite::TestType type=::ns3::TestSuite::UNIT) [constructor]
-    cls.add_constructor([param('std::string', 'name'), param('ns3::TestSuite::TestType', 'type', default_value='::ns3::TestSuite::UNIT')])
-    ## test.h (module 'core'): bool ns3::TestSuite::Run() [member function]
-    cls.add_method('Run', 
-                   'bool', 
-                   [])
-    ## test.h (module 'core'): uint32_t ns3::TestSuite::AddTestCase(ns3::TestCase * testCase) [member function]
-    cls.add_method('AddTestCase', 
-                   'uint32_t', 
-                   [param('ns3::TestCase *', 'testCase')])
-    ## test.h (module 'core'): uint32_t ns3::TestSuite::GetNTestCases() [member function]
-    cls.add_method('GetNTestCases', 
-                   'uint32_t', 
-                   [])
-    ## test.h (module 'core'): ns3::TestCase * ns3::TestSuite::GetTestCase(uint32_t i) [member function]
-    cls.add_method('GetTestCase', 
-                   'ns3::TestCase *', 
-                   [param('uint32_t', 'i')])
-    ## test.h (module 'core'): ns3::TestSuite::TestType ns3::TestSuite::GetTestType() [member function]
-    cls.add_method('GetTestType', 
-                   'ns3::TestSuite::TestType', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::SetVerbose(bool verbose) [member function]
-    cls.add_method('SetVerbose', 
-                   'void', 
-                   [param('bool', 'verbose')])
-    ## test.h (module 'core'): void ns3::TestSuite::SetContinueOnFailure(bool continueOnFailure) [member function]
-    cls.add_method('SetContinueOnFailure', 
-                   'void', 
-                   [param('bool', 'continueOnFailure')])
-    ## test.h (module 'core'): void ns3::TestSuite::SetName(std::string name) [member function]
-    cls.add_method('SetName', 
-                   'void', 
-                   [param('std::string', 'name')])
-    ## test.h (module 'core'): std::string ns3::TestSuite::GetName() [member function]
-    cls.add_method('GetName', 
-                   'std::string', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::SetBaseDir(std::string basedir) [member function]
-    cls.add_method('SetBaseDir', 
-                   'void', 
-                   [param('std::string', 'basedir')])
-    ## test.h (module 'core'): std::string ns3::TestSuite::GetBaseDir() [member function]
-    cls.add_method('GetBaseDir', 
-                   'std::string', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::SetTempDir(std::string dir) [member function]
-    cls.add_method('SetTempDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h (module 'core'): std::string ns3::TestSuite::GetTempDir() [member function]
-    cls.add_method('GetTempDir', 
-                   'std::string', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::SetStream(std::ofstream * ofs) [member function]
-    cls.add_method('SetStream', 
-                   'void', 
-                   [param('std::ofstream *', 'ofs')])
-    ## test.h (module 'core'): void ns3::TestSuite::UpdateErrorStatus(bool error) [member function]
-    cls.add_method('UpdateErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h (module 'core'): void ns3::TestSuite::SetErrorStatus(bool error) [member function]
-    cls.add_method('SetErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h (module 'core'): bool ns3::TestSuite::GetErrorStatus() [member function]
-    cls.add_method('GetErrorStatus', 
-                   'bool', 
-                   [])
-    ## test.h (module 'core'): bool ns3::TestSuite::ContinueOnFailure() [member function]
-    cls.add_method('ContinueOnFailure', 
-                   'bool', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::ReportStart() [member function]
-    cls.add_method('ReportStart', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::ReportSuccess() [member function]
-    cls.add_method('ReportSuccess', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::ReportFailure() [member function]
-    cls.add_method('ReportFailure', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::ReportEnd() [member function]
-    cls.add_method('ReportEnd', 
-                   'void', 
-                   [])
-    ## test.h (module 'core'): void ns3::TestSuite::DoReportStart() [member function]
-    cls.add_method('DoReportStart', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestSuite::DoReportSuccess() [member function]
-    cls.add_method('DoReportSuccess', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestSuite::DoReportFailure() [member function]
-    cls.add_method('DoReportFailure', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestSuite::DoReportEnd() [member function]
-    cls.add_method('DoReportEnd', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestSuite::DoSetup() [member function]
-    cls.add_method('DoSetup', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestSuite::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h (module 'core'): void ns3::TestSuite::DoTeardown() [member function]
-    cls.add_method('DoTeardown', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3Time_methods(root_module, cls):
     cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
     cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))