From ca41890ff0d4e38b85af44da8f46f93395475f05 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Mon, 31 Oct 2011 12:13:18 +0000 Subject: [PATCH] Rescan spectrum module bindings --- src/spectrum/bindings/modulegen__gcc_ILP32.py | 45 ------------------- src/spectrum/bindings/modulegen__gcc_LP64.py | 45 ------------------- 2 files changed, 90 deletions(-) diff --git a/src/spectrum/bindings/modulegen__gcc_ILP32.py b/src/spectrum/bindings/modulegen__gcc_ILP32.py index dc55e9a37..35e93b06c 100644 --- a/src/spectrum/bindings/modulegen__gcc_ILP32.py +++ b/src/spectrum/bindings/modulegen__gcc_ILP32.py @@ -20,8 +20,6 @@ def module_init(): def register_types(module): root_module = module.get_root() - ## log.h (module 'core'): ns3::LogLevel [enumeration] - module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE'], import_from_module='ns.core') ## address.h (module 'network'): ns3::Address [class] module.add_class('Address', import_from_module='ns.network') ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration] @@ -66,8 +64,6 @@ def register_types(module): root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address']) ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class] module.add_class('Ipv6Prefix', import_from_module='ns.network') - ## log.h (module 'core'): ns3::LogComponent [class] - module.add_class('LogComponent', import_from_module='ns.core') ## mac48-address.h (module 'network'): ns3::Mac48Address [class] module.add_class('Mac48Address', import_from_module='ns.network') ## mac48-address.h (module 'network'): ns3::Mac48Address [class] @@ -384,16 +380,10 @@ def register_types(module): typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >', 'ns3::Bands') typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >*', 'ns3::Bands*') typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >&', 'ns3::Bands&') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogTimePrinter') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogTimePrinter*') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogTimePrinter&') typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue') typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -467,7 +457,6 @@ def register_methods(root_module): register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) - register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent']) register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3MicrowaveOvenSpectrumValueHelper_methods(root_module, root_module['ns3::MicrowaveOvenSpectrumValueHelper']) register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer']) @@ -1606,40 +1595,6 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): is_const=True) return -def register_Ns3LogComponent_methods(root_module, cls): - ## log.h (module 'core'): ns3::LogComponent::LogComponent(ns3::LogComponent const & arg0) [copy constructor] - cls.add_constructor([param('ns3::LogComponent const &', 'arg0')]) - ## log.h (module 'core'): ns3::LogComponent::LogComponent(char const * name) [constructor] - cls.add_constructor([param('char const *', 'name')]) - ## log.h (module 'core'): void ns3::LogComponent::Disable(ns3::LogLevel level) [member function] - cls.add_method('Disable', - 'void', - [param('ns3::LogLevel', 'level')]) - ## log.h (module 'core'): void ns3::LogComponent::Enable(ns3::LogLevel level) [member function] - cls.add_method('Enable', - 'void', - [param('ns3::LogLevel', 'level')]) - ## log.h (module 'core'): void ns3::LogComponent::EnvVarCheck(char const * name) [member function] - cls.add_method('EnvVarCheck', - 'void', - [param('char const *', 'name')]) - ## log.h (module 'core'): bool ns3::LogComponent::IsEnabled(ns3::LogLevel level) const [member function] - cls.add_method('IsEnabled', - 'bool', - [param('ns3::LogLevel', 'level')], - is_const=True) - ## log.h (module 'core'): bool ns3::LogComponent::IsNoneEnabled() const [member function] - cls.add_method('IsNoneEnabled', - 'bool', - [], - is_const=True) - ## log.h (module 'core'): char const * ns3::LogComponent::Name() const [member function] - cls.add_method('Name', - 'char const *', - [], - is_const=True) - return - def register_Ns3Mac48Address_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') diff --git a/src/spectrum/bindings/modulegen__gcc_LP64.py b/src/spectrum/bindings/modulegen__gcc_LP64.py index dc55e9a37..35e93b06c 100644 --- a/src/spectrum/bindings/modulegen__gcc_LP64.py +++ b/src/spectrum/bindings/modulegen__gcc_LP64.py @@ -20,8 +20,6 @@ def module_init(): def register_types(module): root_module = module.get_root() - ## log.h (module 'core'): ns3::LogLevel [enumeration] - module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE'], import_from_module='ns.core') ## address.h (module 'network'): ns3::Address [class] module.add_class('Address', import_from_module='ns.network') ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration] @@ -66,8 +64,6 @@ def register_types(module): root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address']) ## ipv6-address.h (module 'network'): ns3::Ipv6Prefix [class] module.add_class('Ipv6Prefix', import_from_module='ns.network') - ## log.h (module 'core'): ns3::LogComponent [class] - module.add_class('LogComponent', import_from_module='ns.core') ## mac48-address.h (module 'network'): ns3::Mac48Address [class] module.add_class('Mac48Address', import_from_module='ns.network') ## mac48-address.h (module 'network'): ns3::Mac48Address [class] @@ -384,16 +380,10 @@ def register_types(module): typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >', 'ns3::Bands') typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >*', 'ns3::Bands*') typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >&', 'ns3::Bands&') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogTimePrinter') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogTimePrinter*') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogTimePrinter&') typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue') typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') - typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -467,7 +457,6 @@ def register_methods(root_module): register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) - register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent']) register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3MicrowaveOvenSpectrumValueHelper_methods(root_module, root_module['ns3::MicrowaveOvenSpectrumValueHelper']) register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer']) @@ -1606,40 +1595,6 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): is_const=True) return -def register_Ns3LogComponent_methods(root_module, cls): - ## log.h (module 'core'): ns3::LogComponent::LogComponent(ns3::LogComponent const & arg0) [copy constructor] - cls.add_constructor([param('ns3::LogComponent const &', 'arg0')]) - ## log.h (module 'core'): ns3::LogComponent::LogComponent(char const * name) [constructor] - cls.add_constructor([param('char const *', 'name')]) - ## log.h (module 'core'): void ns3::LogComponent::Disable(ns3::LogLevel level) [member function] - cls.add_method('Disable', - 'void', - [param('ns3::LogLevel', 'level')]) - ## log.h (module 'core'): void ns3::LogComponent::Enable(ns3::LogLevel level) [member function] - cls.add_method('Enable', - 'void', - [param('ns3::LogLevel', 'level')]) - ## log.h (module 'core'): void ns3::LogComponent::EnvVarCheck(char const * name) [member function] - cls.add_method('EnvVarCheck', - 'void', - [param('char const *', 'name')]) - ## log.h (module 'core'): bool ns3::LogComponent::IsEnabled(ns3::LogLevel level) const [member function] - cls.add_method('IsEnabled', - 'bool', - [param('ns3::LogLevel', 'level')], - is_const=True) - ## log.h (module 'core'): bool ns3::LogComponent::IsNoneEnabled() const [member function] - cls.add_method('IsNoneEnabled', - 'bool', - [], - is_const=True) - ## log.h (module 'core'): char const * ns3::LogComponent::Name() const [member function] - cls.add_method('Name', - 'char const *', - [], - is_const=True) - return - def register_Ns3Mac48Address_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=')