diff --git a/bindings/python/ns3_module_common.py b/bindings/python/ns3_module_common.py index b6a44c031..2b9ad84e3 100644 --- a/bindings/python/ns3_module_common.py +++ b/bindings/python/ns3_module_common.py @@ -609,10 +609,10 @@ def register_Ns3BufferIterator_methods(root_module, cls): return def register_Ns3Chunk_methods(root_module, cls): - ## chunk.h: ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor] - cls.add_constructor([param('ns3::Chunk&', 'arg0', is_const=True)]) ## chunk.h: ns3::Chunk::Chunk() [constructor] cls.add_constructor([]) + ## chunk.h: ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Chunk&', 'arg0', is_const=True)]) ## chunk.h: static ns3::TypeId ns3::Chunk::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index c2ebbafaa..a0d187ade 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -119,8 +119,6 @@ def register_types(module): module.add_class('TracedCallback', template_parameters=['unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty']) ## random-variable.h: ns3::DeterministicVariable [class] module.add_class('DeterministicVariable', parent=root_module['ns3::RandomVariable']) - ## log.h: ns3::LogComponent [class] - module.add_class('LogComponent') ## attribute-list.h: ns3::AttributeList [class] module.add_class('AttributeList') ## attribute.h: ns3::AttributeValue [class] @@ -272,7 +270,6 @@ def register_methods(root_module): register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3WifiMode_Ns3WifiPreamble_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, double, ns3::WifiMode, ns3::WifiPreamble >']) register_Ns3TracedCallback__Unsigned_int_Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< unsigned int, unsigned int, ns3::empty, ns3::empty >']) register_Ns3DeterministicVariable_methods(root_module, root_module['ns3::DeterministicVariable']) - register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent']) register_Ns3AttributeList_methods(root_module, root_module['ns3::AttributeList']) register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue']) register_Ns3UniformVariable_methods(root_module, root_module['ns3::UniformVariable']) @@ -892,10 +889,10 @@ def register_Ns3Empty_methods(root_module, cls): return def register_Ns3ObjectBase_methods(root_module, cls): - ## object-base.h: ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor] - cls.add_constructor([param('ns3::ObjectBase&', 'arg0', is_const=True)]) ## object-base.h: ns3::ObjectBase::ObjectBase() [constructor] cls.add_constructor([]) + ## object-base.h: ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectBase&', 'arg0', is_const=True)]) ## object-base.h: static ns3::TypeId ns3::ObjectBase::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -1332,38 +1329,6 @@ def register_Ns3DeterministicVariable_methods(root_module, cls): cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')]) return -def register_Ns3LogComponent_methods(root_module, cls): - ## log.h: ns3::LogComponent::LogComponent(char const * name) [constructor] - cls.add_constructor([param('char *', 'name', transfer_ownership=False, is_const=True)]) - ## log.h: void ns3::LogComponent::EnvVarCheck(char const * name) [member function] - cls.add_method('EnvVarCheck', - 'void', - [param('char *', 'name', transfer_ownership=False, is_const=True)]) - ## log.h: bool ns3::LogComponent::IsEnabled(ns3::LogLevel level) const [member function] - cls.add_method('IsEnabled', - 'bool', - [param('ns3::LogLevel', 'level')], - is_const=True) - ## log.h: bool ns3::LogComponent::IsNoneEnabled() const [member function] - cls.add_method('IsNoneEnabled', - 'bool', - [], - is_const=True) - ## log.h: void ns3::LogComponent::Enable(ns3::LogLevel level) [member function] - cls.add_method('Enable', - 'void', - [param('ns3::LogLevel', 'level')]) - ## log.h: void ns3::LogComponent::Disable(ns3::LogLevel level) [member function] - cls.add_method('Disable', - 'void', - [param('ns3::LogLevel', 'level')]) - ## log.h: char const * ns3::LogComponent::Name() const [member function] - cls.add_method('Name', - retval('char *', is_const=True, caller_owns_return=False), - [], - is_const=True) - return - def register_Ns3AttributeList_methods(root_module, cls): ## attribute-list.h: ns3::AttributeList::AttributeList() [constructor] cls.add_constructor([]) @@ -2090,10 +2055,6 @@ def register_functions(root_module): module.add_function('MakeObjectFactoryChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## log.h: extern ns3::LogTimePrinter ns3::LogGetTimePrinter() [free function] - module.add_function('LogGetTimePrinter', - 'ns3::LogTimePrinter *', - []) ## log.h: extern void ns3::LogComponentDisableAll(ns3::LogLevel level) [free function] module.add_function('LogComponentDisableAll', 'void', @@ -2106,10 +2067,6 @@ def register_functions(root_module): module.add_function('MakeRandomVariableChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## log.h: extern void ns3::LogSetTimePrinter(ns3::LogTimePrinter arg0) [free function] - module.add_function('LogSetTimePrinter', - 'void', - [param('ns3::LogTimePrinter *', 'arg0')]) ## log.h: extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function] module.add_function('LogComponentDisable', 'void', @@ -2118,10 +2075,6 @@ def register_functions(root_module): module.add_function('LogComponentEnable', 'void', [param('char *', 'name', transfer_ownership=False, is_const=True), param('ns3::LogLevel', 'level')]) - ## log.h: extern void ns3::LogComponentPrintList() [free function] - module.add_function('LogComponentPrintList', - 'void', - []) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) diff --git a/bindings/python/ns3modulescan.py b/bindings/python/ns3modulescan.py index 8f77d5829..05be63d55 100644 --- a/bindings/python/ns3modulescan.py +++ b/bindings/python/ns3modulescan.py @@ -255,8 +255,8 @@ def ns3_module_scan(top_builddir, pygen_file_name, everything_h): gccxml_options = dict( include_paths=[top_builddir], define_symbols={ - 'NS3_ASSERT_ENABLE': None, - 'NS3_LOG_ENABLE': None, + #'NS3_ASSERT_ENABLE': None, + #'NS3_LOG_ENABLE': None, } )