# HG changeset patch # User watrous # Date 1321304458 28800 # Node ID c94d841b44fb30ea4690ffdfdbdc989faf2fe10f # Parent 05504bcb5bae878c22a82649592b5de4ffef128d Rescanned bindings on ns-regression diff -r 05504bcb5bae -r c94d841b44fb src/aodv/bindings/modulegen__gcc_ILP32.py --- a/src/aodv/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/aodv/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -158,6 +158,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2631,6 +2635,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2640,6 +2654,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2723,6 +2747,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/aodv/bindings/modulegen__gcc_LP64.py --- a/src/aodv/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/aodv/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -158,6 +158,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2631,6 +2635,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2640,6 +2654,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2723,6 +2747,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/core/bindings/modulegen__gcc_ILP32.py --- a/src/core/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/core/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -319,6 +319,12 @@ register_types_ns3_FatalImpl(nested_module) + ## Register a nested module for the namespace SystemPath + + nested_module = module.add_cpp_namespace('SystemPath') + register_types_ns3_SystemPath(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -337,6 +343,11 @@ root_module = module.get_root() +def register_types_ns3_SystemPath(module): + root_module = module.get_root() + + module.add_container('std::list< std::string >', 'std::string', container_type='list') + def register_types_ns3_internal(module): root_module = module.get_root() @@ -4180,6 +4191,7 @@ template_parameters=['unsigned char']) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_SystemPath(module.get_submodule('SystemPath'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) return @@ -4261,6 +4273,37 @@ [param('std::ostream *', 'stream')]) return +def register_functions_ns3_SystemPath(module, root_module): + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::Append(std::string left, std::string right) [free function] + module.add_function('Append', + 'std::string', + [param('std::string', 'left'), param('std::string', 'right')]) + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::FindSelfDirectory() [free function] + module.add_function('FindSelfDirectory', + 'std::string', + []) + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::Join(std::_List_const_iterator, std::allocator > > begin, std::_List_const_iterator, std::allocator > > end) [free function] + module.add_function('Join', + 'std::string', + [param('std::_List_const_iterator< std::basic_string< char, std::char_traits< char >, std::allocator< char > > >', 'begin'), param('std::_List_const_iterator< std::basic_string< char, std::char_traits< char >, std::allocator< char > > >', 'end')]) + ## system-path.h (module 'core'): extern void ns3::SystemPath::MakeDirectories(std::string path) [free function] + module.add_function('MakeDirectories', + 'void', + [param('std::string', 'path')]) + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::MakeTemporaryDirectoryName() [free function] + module.add_function('MakeTemporaryDirectoryName', + 'std::string', + []) + ## system-path.h (module 'core'): extern std::list > ns3::SystemPath::ReadFiles(std::string path) [free function] + module.add_function('ReadFiles', + 'std::list< std::string >', + [param('std::string', 'path')]) + ## system-path.h (module 'core'): extern std::list > ns3::SystemPath::Split(std::string path) [free function] + module.add_function('Split', + 'std::list< std::string >', + [param('std::string', 'path')]) + return + def register_functions_ns3_internal(module, root_module): ## double.h (module 'core'): extern ns3::Ptr ns3::internal::MakeDoubleChecker(double min, double max, std::string name) [free function] module.add_function('MakeDoubleChecker', diff -r 05504bcb5bae -r c94d841b44fb src/core/bindings/modulegen__gcc_LP64.py --- a/src/core/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/core/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -319,6 +319,12 @@ register_types_ns3_FatalImpl(nested_module) + ## Register a nested module for the namespace SystemPath + + nested_module = module.add_cpp_namespace('SystemPath') + register_types_ns3_SystemPath(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -337,6 +343,11 @@ root_module = module.get_root() +def register_types_ns3_SystemPath(module): + root_module = module.get_root() + + module.add_container('std::list< std::string >', 'std::string', container_type='list') + def register_types_ns3_internal(module): root_module = module.get_root() @@ -4180,6 +4191,7 @@ template_parameters=['unsigned char']) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_SystemPath(module.get_submodule('SystemPath'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) return @@ -4261,6 +4273,37 @@ [param('std::ostream *', 'stream')]) return +def register_functions_ns3_SystemPath(module, root_module): + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::Append(std::string left, std::string right) [free function] + module.add_function('Append', + 'std::string', + [param('std::string', 'left'), param('std::string', 'right')]) + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::FindSelfDirectory() [free function] + module.add_function('FindSelfDirectory', + 'std::string', + []) + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::Join(std::_List_const_iterator, std::allocator > > begin, std::_List_const_iterator, std::allocator > > end) [free function] + module.add_function('Join', + 'std::string', + [param('std::_List_const_iterator< std::basic_string< char, std::char_traits< char >, std::allocator< char > > >', 'begin'), param('std::_List_const_iterator< std::basic_string< char, std::char_traits< char >, std::allocator< char > > >', 'end')]) + ## system-path.h (module 'core'): extern void ns3::SystemPath::MakeDirectories(std::string path) [free function] + module.add_function('MakeDirectories', + 'void', + [param('std::string', 'path')]) + ## system-path.h (module 'core'): extern std::string ns3::SystemPath::MakeTemporaryDirectoryName() [free function] + module.add_function('MakeTemporaryDirectoryName', + 'std::string', + []) + ## system-path.h (module 'core'): extern std::list > ns3::SystemPath::ReadFiles(std::string path) [free function] + module.add_function('ReadFiles', + 'std::list< std::string >', + [param('std::string', 'path')]) + ## system-path.h (module 'core'): extern std::list > ns3::SystemPath::Split(std::string path) [free function] + module.add_function('Split', + 'std::list< std::string >', + [param('std::string', 'path')]) + return + def register_functions_ns3_internal(module, root_module): ## double.h (module 'core'): extern ns3::Ptr ns3::internal::MakeDoubleChecker(double min, double max, std::string name) [free function] module.add_function('MakeDoubleChecker', diff -r 05504bcb5bae -r c94d841b44fb src/dsdv/bindings/modulegen__gcc_ILP32.py --- a/src/dsdv/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/dsdv/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -152,6 +152,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2499,6 +2503,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2508,6 +2522,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2591,6 +2615,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/dsdv/bindings/modulegen__gcc_LP64.py --- a/src/dsdv/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/dsdv/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -152,6 +152,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2499,6 +2503,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2508,6 +2522,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2591,6 +2615,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/energy/bindings/modulegen__gcc_ILP32.py --- a/src/energy/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/energy/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -2185,9 +2185,9 @@ 'uint8_t', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetDataRate() const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate() const [member function] cls.add_method('GetDataRate', - 'uint32_t', + 'uint64_t', [], is_const=True) ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass ns3::WifiMode::GetModulationClass() const [member function] @@ -2195,9 +2195,9 @@ 'ns3::WifiModulationClass', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetPhyRate() const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate() const [member function] cls.add_method('GetPhyRate', - 'uint32_t', + 'uint64_t', [], is_const=True) ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetUid() const [member function] diff -r 05504bcb5bae -r c94d841b44fb src/energy/bindings/modulegen__gcc_LP64.py --- a/src/energy/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/energy/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -2185,9 +2185,9 @@ 'uint8_t', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetDataRate() const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate() const [member function] cls.add_method('GetDataRate', - 'uint32_t', + 'uint64_t', [], is_const=True) ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass ns3::WifiMode::GetModulationClass() const [member function] @@ -2195,9 +2195,9 @@ 'ns3::WifiModulationClass', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetPhyRate() const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate() const [member function] cls.add_method('GetPhyRate', - 'uint32_t', + 'uint64_t', [], is_const=True) ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetUid() const [member function] diff -r 05504bcb5bae -r c94d841b44fb src/flow-monitor/bindings/modulegen__gcc_ILP32.py --- a/src/flow-monitor/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/flow-monitor/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -116,6 +116,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2347,6 +2351,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2356,6 +2370,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2439,6 +2463,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/flow-monitor/bindings/modulegen__gcc_LP64.py --- a/src/flow-monitor/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/flow-monitor/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -116,6 +116,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2347,6 +2351,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2356,6 +2370,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2439,6 +2463,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/internet/bindings/modulegen__gcc_ILP32.py --- a/src/internet/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/internet/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -322,6 +322,10 @@ module.add_class('Ipv4GlobalRoutingHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header']) ## ipv4-list-routing-helper.h (module 'internet'): ns3::Ipv4ListRoutingHelper [class] module.add_class('Ipv4ListRoutingHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## ipv4-packet-info-tag.h (module 'internet'): ns3::Ipv4PacketInfoTag [class] @@ -6068,6 +6072,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -6077,6 +6091,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -6160,6 +6184,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/internet/bindings/modulegen__gcc_LP64.py --- a/src/internet/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/internet/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -322,6 +322,10 @@ module.add_class('Ipv4GlobalRoutingHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header']) ## ipv4-list-routing-helper.h (module 'internet'): ns3::Ipv4ListRoutingHelper [class] module.add_class('Ipv4ListRoutingHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## ipv4-packet-info-tag.h (module 'internet'): ns3::Ipv4PacketInfoTag [class] @@ -6068,6 +6072,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -6077,6 +6091,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -6160,6 +6184,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/lte/bindings/callbacks_list.py --- a/src/lte/bindings/callbacks_list.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/lte/bindings/callbacks_list.py Mon Nov 14 13:00:58 2011 -0800 @@ -1,9 +1,9 @@ callback_classes = [ - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ] diff -r 05504bcb5bae -r c94d841b44fb src/lte/bindings/modulegen__gcc_ILP32.py --- a/src/lte/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/lte/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -442,12 +442,12 @@ module.add_container('std::list< ns3::PdcchMapIdealControlMessage::IdealPdcchRecord >', 'ns3::PdcchMapIdealControlMessage::IdealPdcchRecord', container_type='list') module.add_container('std::list< ns3::CqiIdealControlMessage::CqiFeedback >', 'ns3::CqiIdealControlMessage::CqiFeedback', container_type='list') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') + 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('ns3::Vector3DValue', 'ns3::VectorValue') typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') @@ -472,9 +472,6 @@ 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('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('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') @@ -484,6 +481,9 @@ typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') ## Register a nested module for the namespace FatalImpl diff -r 05504bcb5bae -r c94d841b44fb src/lte/bindings/modulegen__gcc_LP64.py --- a/src/lte/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/lte/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -112,10 +112,6 @@ module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumType [class] - module.add_class('SpectrumType', import_from_module='ns.spectrum') - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory [class] - module.add_class('SpectrumTypeFactory', import_from_module='ns.spectrum') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -244,6 +240,8 @@ module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::SpectrumModel', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::SpectrumSignalParameters', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::SpectrumValue', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] @@ -256,6 +254,8 @@ module.add_class('SpectrumPhy', import_from_module='ns.spectrum', parent=root_module['ns3::Object']) ## spectrum-propagation-loss-model.h (module 'spectrum'): ns3::SpectrumPropagationLossModel [class] module.add_class('SpectrumPropagationLossModel', import_from_module='ns.spectrum', parent=root_module['ns3::Object']) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters [struct] + module.add_class('SpectrumSignalParameters', import_from_module='ns.spectrum', parent=root_module['ns3::SimpleRefCount< ns3::SpectrumSignalParameters, ns3::empty, ns3::DefaultDeleter >']) ## spectrum-value.h (module 'spectrum'): ns3::SpectrumValue [class] module.add_class('SpectrumValue', import_from_module='ns.spectrum', parent=root_module['ns3::SimpleRefCount< ns3::SpectrumValue, ns3::empty, ns3::DefaultDeleter >']) ## nstime.h (module 'core'): ns3::Time [class] @@ -342,6 +342,8 @@ module.add_class('LteSpectrumPhy', parent=root_module['ns3::SpectrumPhy']) ## lte-spectrum-phy.h (module 'lte'): ns3::LteSpectrumPhy::State [enumeration] module.add_enum('State', ['IDLE', 'TX', 'RX'], outer_class=root_module['ns3::LteSpectrumPhy']) + ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParameters [struct] + module.add_class('LteSpectrumSignalParameters', parent=root_module['ns3::SpectrumSignalParameters']) ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class] module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] @@ -440,9 +442,6 @@ module.add_container('std::list< ns3::PdcchMapIdealControlMessage::IdealPdcchRecord >', 'ns3::PdcchMapIdealControlMessage::IdealPdcchRecord', container_type='list') module.add_container('std::list< ns3::CqiIdealControlMessage::CqiFeedback >', 'ns3::CqiIdealControlMessage::CqiFeedback', container_type='list') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -473,15 +472,18 @@ 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::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') ## Register a nested module for the namespace FatalImpl @@ -553,8 +555,6 @@ register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) - register_Ns3SpectrumType_methods(root_module, root_module['ns3::SpectrumType']) - register_Ns3SpectrumTypeFactory_methods(root_module, root_module['ns3::SpectrumTypeFactory']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TlvValue_methods(root_module, root_module['ns3::TlvValue']) @@ -613,12 +613,14 @@ register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3SpectrumModel_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumModel__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SpectrumModel, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3SpectrumSignalParameters_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumSignalParameters__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SpectrumSignalParameters, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3SpectrumValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SpectrumValue, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SpectrumInterference_methods(root_module, root_module['ns3::SpectrumInterference']) register_Ns3SpectrumModel_methods(root_module, root_module['ns3::SpectrumModel']) register_Ns3SpectrumPhy_methods(root_module, root_module['ns3::SpectrumPhy']) register_Ns3SpectrumPropagationLossModel_methods(root_module, root_module['ns3::SpectrumPropagationLossModel']) + register_Ns3SpectrumSignalParameters_methods(root_module, root_module['ns3::SpectrumSignalParameters']) register_Ns3SpectrumValue_methods(root_module, root_module['ns3::SpectrumValue']) register_Ns3Time_methods(root_module, root_module['ns3::Time']) register_Ns3Tlv_methods(root_module, root_module['ns3::Tlv']) @@ -656,6 +658,7 @@ register_Ns3LtePhy_methods(root_module, root_module['ns3::LtePhy']) register_Ns3LtePropagationLossModel_methods(root_module, root_module['ns3::LtePropagationLossModel']) register_Ns3LteSpectrumPhy_methods(root_module, root_module['ns3::LteSpectrumPhy']) + register_Ns3LteSpectrumSignalParameters_methods(root_module, root_module['ns3::LteSpectrumSignalParameters']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) register_Ns3MacEntity_methods(root_module, root_module['ns3::MacEntity']) @@ -2346,41 +2349,6 @@ is_static=True) return -def register_Ns3SpectrumType_methods(root_module, cls): - cls.add_binary_comparison_operator('!=') - cls.add_output_stream_operator() - cls.add_binary_comparison_operator('==') - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumType::SpectrumType(ns3::SpectrumType const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SpectrumType const &', 'arg0')]) - ## spectrum-type.h (module 'spectrum'): std::string ns3::SpectrumType::GetName() const [member function] - cls.add_method('GetName', - 'std::string', - [], - is_const=True) - ## spectrum-type.h (module 'spectrum'): uint32_t ns3::SpectrumType::GetUid() const [member function] - cls.add_method('GetUid', - 'uint32_t', - [], - is_const=True) - return - -def register_Ns3SpectrumTypeFactory_methods(root_module, cls): - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory::SpectrumTypeFactory() [constructor] - cls.add_constructor([]) - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory::SpectrumTypeFactory(ns3::SpectrumTypeFactory const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SpectrumTypeFactory const &', 'arg0')]) - ## spectrum-type.h (module 'spectrum'): static ns3::SpectrumType ns3::SpectrumTypeFactory::Create(std::string name) [member function] - cls.add_method('Create', - 'ns3::SpectrumType', - [param('std::string', 'name')], - is_static=True) - ## spectrum-type.h (module 'spectrum'): static std::string ns3::SpectrumTypeFactory::GetNameByUid(uint32_t uid) [member function] - cls.add_method('GetNameByUid', - 'std::string', - [param('uint32_t', 'uid')], - is_static=True) - return - def register_Ns3Tag_methods(root_module, cls): ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] cls.add_constructor([]) @@ -3980,6 +3948,18 @@ is_static=True) return +def register_Ns3SimpleRefCount__Ns3SpectrumSignalParameters_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumSignalParameters__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::SpectrumSignalParameters, ns3::empty, ns3::DefaultDeleter< ns3::SpectrumSignalParameters > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + def register_Ns3SimpleRefCount__Ns3SpectrumValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumValue__gt___methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -4106,10 +4086,10 @@ 'void', [param('ns3::Ptr< ns3::MobilityModel >', 'm')], is_pure_virtual=True, is_virtual=True) - ## spectrum-phy.h (module 'spectrum'): void ns3::SpectrumPhy::StartRx(ns3::Ptr p, ns3::Ptr rxPsd, ns3::SpectrumType st, ns3::Time duration) [member function] + ## spectrum-phy.h (module 'spectrum'): void ns3::SpectrumPhy::StartRx(ns3::Ptr params) [member function] cls.add_method('StartRx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue const >', 'rxPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_pure_virtual=True, is_virtual=True) return @@ -4144,6 +4124,24 @@ is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) return +def register_Ns3SpectrumSignalParameters_methods(root_module, cls): + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::SpectrumSignalParameters() [constructor] + cls.add_constructor([]) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::SpectrumSignalParameters(ns3::SpectrumSignalParameters const & p) [copy constructor] + cls.add_constructor([param('ns3::SpectrumSignalParameters const &', 'p')]) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::Ptr ns3::SpectrumSignalParameters::Copy() [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::SpectrumSignalParameters >', + [], + is_virtual=True) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::duration [variable] + cls.add_instance_attribute('duration', 'ns3::Time', is_const=False) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::psd [variable] + cls.add_instance_attribute('psd', 'ns3::Ptr< ns3::SpectrumValue >', is_const=False) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::txPhy [variable] + cls.add_instance_attribute('txPhy', 'ns3::Ptr< ns3::SpectrumPhy >', is_const=False) + return + def register_Ns3SpectrumValue_methods(root_module, cls): cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) @@ -5496,10 +5494,6 @@ 'ns3::Ptr< ns3::SpectrumModel const >', [], is_const=True, is_virtual=True) - ## lte-spectrum-phy.h (module 'lte'): ns3::SpectrumType ns3::LteSpectrumPhy::GetSpectrumType() [member function] - cls.add_method('GetSpectrumType', - 'ns3::SpectrumType', - []) ## lte-spectrum-phy.h (module 'lte'): static ns3::TypeId ns3::LteSpectrumPhy::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -5548,10 +5542,10 @@ cls.add_method('SetTxPowerSpectralDensity', 'void', [param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd')]) - ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRx(ns3::Ptr pb, ns3::Ptr rxPsd, ns3::SpectrumType st, ns3::Time duration) [member function] + ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRx(ns3::Ptr params) [member function] cls.add_method('StartRx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'pb'), param('ns3::Ptr< ns3::SpectrumValue const >', 'rxPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_virtual=True) ## lte-spectrum-phy.h (module 'lte'): bool ns3::LteSpectrumPhy::StartTx(ns3::Ptr pb) [member function] cls.add_method('StartTx', @@ -5564,6 +5558,20 @@ visibility='private', is_virtual=True) return +def register_Ns3LteSpectrumSignalParameters_methods(root_module, cls): + ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParameters::LteSpectrumSignalParameters() [constructor] + cls.add_constructor([]) + ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParameters::LteSpectrumSignalParameters(ns3::LteSpectrumSignalParameters const & p) [copy constructor] + cls.add_constructor([param('ns3::LteSpectrumSignalParameters const &', 'p')]) + ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::Ptr ns3::LteSpectrumSignalParameters::Copy() [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::SpectrumSignalParameters >', + [], + is_virtual=True) + ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParameters::packetBurst [variable] + cls.add_instance_attribute('packetBurst', 'ns3::Ptr< ns3::PacketBurst >', is_const=False) + return + def register_Ns3Mac48AddressChecker_methods(root_module, cls): ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor] cls.add_constructor([]) @@ -6331,10 +6339,10 @@ 'void', [param('ns3::Ptr< ns3::PropagationDelayModel >', 'delay')], is_pure_virtual=True, is_virtual=True) - ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::StartTx(ns3::Ptr p, ns3::Ptr txPsd, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr sender) [member function] + ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::StartTx(ns3::Ptr params) [member function] cls.add_method('StartTx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'sender')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_pure_virtual=True, is_virtual=True) return @@ -7057,21 +7065,16 @@ 'void', [param('ns3::Ptr< ns3::PropagationDelayModel >', 'delay')], is_virtual=True) - ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::StartTx(ns3::Ptr p, ns3::Ptr txPsd, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr sender) [member function] + ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::StartTx(ns3::Ptr params) [member function] cls.add_method('StartTx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'sender')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_virtual=True) ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='private', is_virtual=True) - ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::StartRx(ns3::Ptr p, ns3::Ptr rxPowerSpectrum, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr receiver) [member function] - cls.add_method('StartRx', - 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'rxPowerSpectrum'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'receiver')], - visibility='private', is_virtual=True) return def register_Ns3UeNetDevice_methods(root_module, cls): diff -r 05504bcb5bae -r c94d841b44fb src/mesh/bindings/modulegen__gcc_ILP32.py --- a/src/mesh/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/mesh/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -3376,6 +3376,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right')) @@ -3428,7 +3429,6 @@ cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right')) - cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right')) cls.add_output_stream_operator() @@ -4325,11 +4325,11 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) 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')) cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') diff -r 05504bcb5bae -r c94d841b44fb src/mesh/bindings/modulegen__gcc_LP64.py --- a/src/mesh/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/mesh/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -3228,9 +3228,9 @@ 'uint8_t', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetDataRate() const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate() const [member function] cls.add_method('GetDataRate', - 'uint32_t', + 'uint64_t', [], is_const=True) ## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass ns3::WifiMode::GetModulationClass() const [member function] @@ -3238,9 +3238,9 @@ 'ns3::WifiModulationClass', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetPhyRate() const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate() const [member function] cls.add_method('GetPhyRate', - 'uint32_t', + 'uint64_t', [], is_const=True) ## wifi-mode.h (module 'wifi'): uint32_t ns3::WifiMode::GetUid() const [member function] diff -r 05504bcb5bae -r c94d841b44fb src/netanim/bindings/modulegen__gcc_ILP32.py --- a/src/netanim/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/netanim/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -523,6 +523,10 @@ cls.add_method('SetAnimWriteCallback', 'void', [param('void ( * ) ( char const * ) *', 'cb')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetConstantPosition(ns3::Ptr n, double x, double y, double z=0) [member function] + cls.add_method('SetConstantPosition', + 'void', + [param('ns3::Ptr< ns3::Node >', 'n'), param('double', 'x'), param('double', 'y'), param('double', 'z', default_value='0')]) ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetMobilityPollInterval(ns3::Time t) [member function] cls.add_method('SetMobilityPollInterval', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/netanim/bindings/modulegen__gcc_LP64.py --- a/src/netanim/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/netanim/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -523,6 +523,10 @@ cls.add_method('SetAnimWriteCallback', 'void', [param('void ( * ) ( char const * ) *', 'cb')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetConstantPosition(ns3::Ptr n, double x, double y, double z=0) [member function] + cls.add_method('SetConstantPosition', + 'void', + [param('ns3::Ptr< ns3::Node >', 'n'), param('double', 'x'), param('double', 'y'), param('double', 'z', default_value='0')]) ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetMobilityPollInterval(ns3::Time t) [member function] cls.add_method('SetMobilityPollInterval', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py --- a/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -118,6 +118,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## ipv4-nix-vector-helper.h (module 'nix-vector-routing'): ns3::Ipv4NixVectorHelper [class] module.add_class('Ipv4NixVectorHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## object.h (module 'core'): ns3::Object [class] @@ -2298,6 +2302,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2307,6 +2321,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2390,6 +2414,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/nix-vector-routing/bindings/modulegen__gcc_LP64.py --- a/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -118,6 +118,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## ipv4-nix-vector-helper.h (module 'nix-vector-routing'): ns3::Ipv4NixVectorHelper [class] module.add_class('Ipv4NixVectorHelper', parent=root_module['ns3::Ipv4RoutingHelper']) ## object.h (module 'core'): ns3::Object [class] @@ -2298,6 +2302,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2307,6 +2321,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2390,6 +2414,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/olsr/bindings/modulegen__gcc_ILP32.py --- a/src/olsr/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/olsr/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -158,6 +158,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2864,6 +2868,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2873,6 +2887,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2956,6 +2980,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/olsr/bindings/modulegen__gcc_LP64.py --- a/src/olsr/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/olsr/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -158,6 +158,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2864,6 +2868,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2873,6 +2887,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2956,6 +2980,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py --- a/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -156,6 +156,10 @@ module.add_class('InternetStackHelper', import_from_module='ns.internet', parent=[root_module['ns3::PcapHelperForIpv4'], root_module['ns3::PcapHelperForIpv6'], root_module['ns3::AsciiTraceHelperForIpv4'], root_module['ns3::AsciiTraceHelperForIpv6']]) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class] module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration] @@ -3239,6 +3243,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -3248,6 +3262,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -3331,6 +3355,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/point-to-point-layout/bindings/modulegen__gcc_LP64.py --- a/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -156,6 +156,10 @@ module.add_class('InternetStackHelper', import_from_module='ns.internet', parent=[root_module['ns3::PcapHelperForIpv4'], root_module['ns3::PcapHelperForIpv6'], root_module['ns3::AsciiTraceHelperForIpv4'], root_module['ns3::AsciiTraceHelperForIpv6']]) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## ipv6-header.h (module 'internet'): ns3::Ipv6Header [class] module.add_class('Ipv6Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) ## ipv6-header.h (module 'internet'): ns3::Ipv6Header::NextHeader_e [enumeration] @@ -3239,6 +3243,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -3248,6 +3262,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -3331,6 +3355,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/spectrum/bindings/callbacks_list.py --- a/src/spectrum/bindings/callbacks_list.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/spectrum/bindings/callbacks_list.py Mon Nov 14 13:00:58 2011 -0800 @@ -1,7 +1,7 @@ callback_classes = [ - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff -r 05504bcb5bae -r c94d841b44fb src/spectrum/bindings/modulegen__gcc_ILP32.py --- a/src/spectrum/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/spectrum/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -373,15 +373,12 @@ module.add_container('std::vector< double >', 'double', container_type='vector') module.add_container('ns3::Bands', 'ns3::BandInfo', container_type='vector') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') + 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('ns3::Vector3DValue', 'ns3::VectorValue') typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') @@ -406,15 +403,18 @@ typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') - 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('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') diff -r 05504bcb5bae -r c94d841b44fb src/spectrum/bindings/modulegen__gcc_LP64.py --- a/src/spectrum/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/spectrum/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -112,10 +112,6 @@ module.add_class('SpectrumChannelHelper') ## spectrum-helper.h (module 'spectrum'): ns3::SpectrumPhyHelper [class] module.add_class('SpectrumPhyHelper') - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumType [class] - module.add_class('SpectrumType') - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory [class] - module.add_class('SpectrumTypeFactory') ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs [class] module.add_class('SystemWallClockMs', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] @@ -214,6 +210,8 @@ module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::SpectrumConverter', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::SpectrumModel', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::SpectrumSignalParameters', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::SpectrumValue', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] @@ -230,6 +228,8 @@ module.add_class('SpectrumPhy', parent=root_module['ns3::Object']) ## spectrum-propagation-loss-model.h (module 'spectrum'): ns3::SpectrumPropagationLossModel [class] module.add_class('SpectrumPropagationLossModel', parent=root_module['ns3::Object']) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters [struct] + module.add_class('SpectrumSignalParameters', parent=root_module['ns3::SimpleRefCount< ns3::SpectrumSignalParameters, ns3::empty, ns3::DefaultDeleter >']) ## spectrum-value.h (module 'spectrum'): ns3::SpectrumValue [class] module.add_class('SpectrumValue', parent=root_module['ns3::SimpleRefCount< ns3::SpectrumValue, ns3::empty, ns3::DefaultDeleter >']) ## propagation-loss-model.h (module 'propagation'): ns3::ThreeLogDistancePropagationLossModel [class] @@ -284,6 +284,8 @@ module.add_class('HalfDuplexIdealPhy', parent=root_module['ns3::SpectrumPhy']) ## half-duplex-ideal-phy.h (module 'spectrum'): ns3::HalfDuplexIdealPhy::State [enumeration] module.add_enum('State', ['IDLE', 'TX', 'RX'], outer_class=root_module['ns3::HalfDuplexIdealPhy']) + ## half-duplex-ideal-phy-signal-parameters.h (module 'spectrum'): ns3::HalfDuplexIdealPhySignalParameters [struct] + module.add_class('HalfDuplexIdealPhySignalParameters', parent=root_module['ns3::SpectrumSignalParameters']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class] module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class] @@ -371,9 +373,6 @@ module.add_container('std::vector< double >', 'double', container_type='vector') module.add_container('ns3::Bands', 'ns3::BandInfo', container_type='vector') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -404,15 +403,18 @@ typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') @@ -479,8 +481,6 @@ register_Ns3SpectrumAnalyzerHelper_methods(root_module, root_module['ns3::SpectrumAnalyzerHelper']) register_Ns3SpectrumChannelHelper_methods(root_module, root_module['ns3::SpectrumChannelHelper']) register_Ns3SpectrumPhyHelper_methods(root_module, root_module['ns3::SpectrumPhyHelper']) - register_Ns3SpectrumType_methods(root_module, root_module['ns3::SpectrumType']) - register_Ns3SpectrumTypeFactory_methods(root_module, root_module['ns3::SpectrumTypeFactory']) 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']) @@ -529,6 +529,7 @@ register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3SpectrumConverter_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumConverter__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SpectrumConverter, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3SpectrumModel_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumModel__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SpectrumModel, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3SpectrumSignalParameters_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumSignalParameters__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SpectrumSignalParameters, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3SpectrumValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::SpectrumValue, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SpectrumConverter_methods(root_module, root_module['ns3::SpectrumConverter']) @@ -537,6 +538,7 @@ register_Ns3SpectrumModel_methods(root_module, root_module['ns3::SpectrumModel']) register_Ns3SpectrumPhy_methods(root_module, root_module['ns3::SpectrumPhy']) register_Ns3SpectrumPropagationLossModel_methods(root_module, root_module['ns3::SpectrumPropagationLossModel']) + register_Ns3SpectrumSignalParameters_methods(root_module, root_module['ns3::SpectrumSignalParameters']) register_Ns3SpectrumValue_methods(root_module, root_module['ns3::SpectrumValue']) register_Ns3ThreeLogDistancePropagationLossModel_methods(root_module, root_module['ns3::ThreeLogDistancePropagationLossModel']) register_Ns3Time_methods(root_module, root_module['ns3::Time']) @@ -561,6 +563,7 @@ register_Ns3FriisPropagationLossModel_methods(root_module, root_module['ns3::FriisPropagationLossModel']) register_Ns3FriisSpectrumPropagationLossModel_methods(root_module, root_module['ns3::FriisSpectrumPropagationLossModel']) register_Ns3HalfDuplexIdealPhy_methods(root_module, root_module['ns3::HalfDuplexIdealPhy']) + register_Ns3HalfDuplexIdealPhySignalParameters_methods(root_module, root_module['ns3::HalfDuplexIdealPhySignalParameters']) register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker']) register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue']) register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker']) @@ -2286,41 +2289,6 @@ [param('std::string', 'name'), param('ns3::AttributeValue const &', 'v')]) return -def register_Ns3SpectrumType_methods(root_module, cls): - cls.add_binary_comparison_operator('!=') - cls.add_output_stream_operator() - cls.add_binary_comparison_operator('==') - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumType::SpectrumType(ns3::SpectrumType const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SpectrumType const &', 'arg0')]) - ## spectrum-type.h (module 'spectrum'): std::string ns3::SpectrumType::GetName() const [member function] - cls.add_method('GetName', - 'std::string', - [], - is_const=True) - ## spectrum-type.h (module 'spectrum'): uint32_t ns3::SpectrumType::GetUid() const [member function] - cls.add_method('GetUid', - 'uint32_t', - [], - is_const=True) - return - -def register_Ns3SpectrumTypeFactory_methods(root_module, cls): - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory::SpectrumTypeFactory() [constructor] - cls.add_constructor([]) - ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory::SpectrumTypeFactory(ns3::SpectrumTypeFactory const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SpectrumTypeFactory const &', 'arg0')]) - ## spectrum-type.h (module 'spectrum'): static ns3::SpectrumType ns3::SpectrumTypeFactory::Create(std::string name) [member function] - cls.add_method('Create', - 'ns3::SpectrumType', - [param('std::string', 'name')], - is_static=True) - ## spectrum-type.h (module 'spectrum'): static std::string ns3::SpectrumTypeFactory::GetNameByUid(uint32_t uid) [member function] - cls.add_method('GetNameByUid', - 'std::string', - [param('uint32_t', 'uid')], - is_static=True) - return - def register_Ns3SystemWallClockMs_methods(root_module, cls): ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs::SystemWallClockMs(ns3::SystemWallClockMs const & arg0) [copy constructor] cls.add_constructor([param('ns3::SystemWallClockMs const &', 'arg0')]) @@ -3450,6 +3418,18 @@ is_static=True) return +def register_Ns3SimpleRefCount__Ns3SpectrumSignalParameters_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumSignalParameters__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::SpectrumSignalParameters, ns3::empty, ns3::DefaultDeleter< ns3::SpectrumSignalParameters > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + def register_Ns3SimpleRefCount__Ns3SpectrumValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3SpectrumValue__gt___methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -3612,10 +3592,10 @@ 'void', [param('ns3::Ptr< ns3::MobilityModel >', 'm')], is_pure_virtual=True, is_virtual=True) - ## spectrum-phy.h (module 'spectrum'): void ns3::SpectrumPhy::StartRx(ns3::Ptr p, ns3::Ptr rxPsd, ns3::SpectrumType st, ns3::Time duration) [member function] + ## spectrum-phy.h (module 'spectrum'): void ns3::SpectrumPhy::StartRx(ns3::Ptr params) [member function] cls.add_method('StartRx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue const >', 'rxPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_pure_virtual=True, is_virtual=True) return @@ -3650,6 +3630,24 @@ is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) return +def register_Ns3SpectrumSignalParameters_methods(root_module, cls): + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::SpectrumSignalParameters() [constructor] + cls.add_constructor([]) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::SpectrumSignalParameters(ns3::SpectrumSignalParameters const & p) [copy constructor] + cls.add_constructor([param('ns3::SpectrumSignalParameters const &', 'p')]) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::Ptr ns3::SpectrumSignalParameters::Copy() [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::SpectrumSignalParameters >', + [], + is_virtual=True) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::duration [variable] + cls.add_instance_attribute('duration', 'ns3::Time', is_const=False) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::psd [variable] + cls.add_instance_attribute('psd', 'ns3::Ptr< ns3::SpectrumValue >', is_const=False) + ## spectrum-signal-parameters.h (module 'spectrum'): ns3::SpectrumSignalParameters::txPhy [variable] + cls.add_instance_attribute('txPhy', 'ns3::Ptr< ns3::SpectrumPhy >', is_const=False) + return + def register_Ns3SpectrumValue_methods(root_module, cls): cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) @@ -4031,10 +4029,6 @@ 'ns3::Ptr< ns3::SpectrumModel const >', [], is_const=True, is_virtual=True) - ## waveform-generator.h (module 'spectrum'): ns3::SpectrumType ns3::WaveformGenerator::GetSpectrumType() [member function] - cls.add_method('GetSpectrumType', - 'ns3::SpectrumType', - []) ## waveform-generator.h (module 'spectrum'): static ns3::TypeId ns3::WaveformGenerator::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -4072,10 +4066,10 @@ 'void', [], is_virtual=True) - ## waveform-generator.h (module 'spectrum'): void ns3::WaveformGenerator::StartRx(ns3::Ptr p, ns3::Ptr rxPsd, ns3::SpectrumType st, ns3::Time duration) [member function] + ## waveform-generator.h (module 'spectrum'): void ns3::WaveformGenerator::StartRx(ns3::Ptr params) [member function] cls.add_method('StartRx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue const >', 'rxPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_virtual=True) ## waveform-generator.h (module 'spectrum'): void ns3::WaveformGenerator::Stop() [member function] cls.add_method('Stop', @@ -4538,10 +4532,6 @@ 'ns3::Ptr< ns3::SpectrumModel const >', [], is_const=True, is_virtual=True) - ## half-duplex-ideal-phy.h (module 'spectrum'): ns3::SpectrumType ns3::HalfDuplexIdealPhy::GetSpectrumType() [member function] - cls.add_method('GetSpectrumType', - 'ns3::SpectrumType', - []) ## half-duplex-ideal-phy.h (module 'spectrum'): static ns3::TypeId ns3::HalfDuplexIdealPhy::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -4590,10 +4580,10 @@ cls.add_method('SetTxPowerSpectralDensity', 'void', [param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd')]) - ## half-duplex-ideal-phy.h (module 'spectrum'): void ns3::HalfDuplexIdealPhy::StartRx(ns3::Ptr p, ns3::Ptr rxPsd, ns3::SpectrumType st, ns3::Time duration) [member function] + ## half-duplex-ideal-phy.h (module 'spectrum'): void ns3::HalfDuplexIdealPhy::StartRx(ns3::Ptr params) [member function] cls.add_method('StartRx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue const >', 'rxPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_virtual=True) ## half-duplex-ideal-phy.h (module 'spectrum'): bool ns3::HalfDuplexIdealPhy::StartTx(ns3::Ptr p) [member function] cls.add_method('StartTx', @@ -4606,6 +4596,20 @@ visibility='private', is_virtual=True) return +def register_Ns3HalfDuplexIdealPhySignalParameters_methods(root_module, cls): + ## half-duplex-ideal-phy-signal-parameters.h (module 'spectrum'): ns3::HalfDuplexIdealPhySignalParameters::HalfDuplexIdealPhySignalParameters() [constructor] + cls.add_constructor([]) + ## half-duplex-ideal-phy-signal-parameters.h (module 'spectrum'): ns3::HalfDuplexIdealPhySignalParameters::HalfDuplexIdealPhySignalParameters(ns3::HalfDuplexIdealPhySignalParameters const & p) [copy constructor] + cls.add_constructor([param('ns3::HalfDuplexIdealPhySignalParameters const &', 'p')]) + ## half-duplex-ideal-phy-signal-parameters.h (module 'spectrum'): ns3::Ptr ns3::HalfDuplexIdealPhySignalParameters::Copy() [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::SpectrumSignalParameters >', + [], + is_virtual=True) + ## half-duplex-ideal-phy-signal-parameters.h (module 'spectrum'): ns3::HalfDuplexIdealPhySignalParameters::data [variable] + cls.add_instance_attribute('data', 'ns3::Ptr< ns3::Packet >', is_const=False) + return + def register_Ns3Ipv4AddressChecker_methods(root_module, cls): ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor] cls.add_constructor([]) @@ -5669,10 +5673,10 @@ 'void', [], is_virtual=True) - ## spectrum-analyzer.h (module 'spectrum'): void ns3::SpectrumAnalyzer::StartRx(ns3::Ptr pb, ns3::Ptr rxPowerSpectralDensity, ns3::SpectrumType st, ns3::Time duration) [member function] + ## spectrum-analyzer.h (module 'spectrum'): void ns3::SpectrumAnalyzer::StartRx(ns3::Ptr params) [member function] cls.add_method('StartRx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'pb'), param('ns3::Ptr< ns3::SpectrumValue const >', 'rxPowerSpectralDensity'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_virtual=True) ## spectrum-analyzer.h (module 'spectrum'): void ns3::SpectrumAnalyzer::Stop() [member function] cls.add_method('Stop', @@ -5721,10 +5725,10 @@ 'void', [param('ns3::Ptr< ns3::PropagationDelayModel >', 'delay')], is_pure_virtual=True, is_virtual=True) - ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::StartTx(ns3::Ptr p, ns3::Ptr txPsd, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr sender) [member function] + ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::StartTx(ns3::Ptr params) [member function] cls.add_method('StartTx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'sender')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_pure_virtual=True, is_virtual=True) return @@ -6148,20 +6152,20 @@ 'void', [param('ns3::Ptr< ns3::PropagationDelayModel >', 'delay')], is_virtual=True) - ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::StartTx(ns3::Ptr p, ns3::Ptr txPsd, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr sender) [member function] + ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::StartTx(ns3::Ptr params) [member function] cls.add_method('StartTx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'sender')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_virtual=True) ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True) - ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::StartRx(ns3::Ptr p, ns3::Ptr rxPowerSpectrum, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr receiver) [member function] + ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::StartRx(ns3::Ptr params, ns3::Ptr receiver) [member function] cls.add_method('StartRx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'rxPowerSpectrum'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'receiver')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params'), param('ns3::Ptr< ns3::SpectrumPhy >', 'receiver')], visibility='private', is_virtual=True) return @@ -6210,25 +6214,24 @@ 'void', [param('ns3::Ptr< ns3::PropagationDelayModel >', 'delay')], is_virtual=True) - ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::StartTx(ns3::Ptr p, ns3::Ptr txPsd, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr sender) [member function] + ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::StartTx(ns3::Ptr params) [member function] cls.add_method('StartTx', 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'sender')], + [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], is_virtual=True) ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='private', is_virtual=True) - ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::StartRx(ns3::Ptr p, ns3::Ptr rxPowerSpectrum, ns3::SpectrumType st, ns3::Time duration, ns3::Ptr receiver) [member function] - cls.add_method('StartRx', - 'void', - [param('ns3::Ptr< ns3::PacketBurst >', 'p'), param('ns3::Ptr< ns3::SpectrumValue >', 'rxPowerSpectrum'), param('ns3::SpectrumType', 'st'), param('ns3::Time', 'duration'), param('ns3::Ptr< ns3::SpectrumPhy >', 'receiver')], - visibility='private', is_virtual=True) return def register_functions(root_module): module = root_module + ## spectrum-value.h (module 'spectrum'): extern double ns3::Integral(ns3::SpectrumValue const & arg) [free function] + module.add_function('Integral', + 'double', + [param('ns3::SpectrumValue const &', 'arg')]) ## spectrum-value.h (module 'spectrum'): extern ns3::SpectrumValue ns3::Log(ns3::SpectrumValue const & arg) [free function] module.add_function('Log', 'ns3::SpectrumValue', diff -r 05504bcb5bae -r c94d841b44fb src/uan/bindings/modulegen__gcc_ILP32.py --- a/src/uan/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/uan/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -3835,6 +3835,11 @@ 'ns3::Address', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## uan-mac.h (module 'uan'): static ns3::TypeId ns3::UanMac::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-mac.h (module 'uan'): void ns3::UanMac::SetAddress(ns3::UanAddress addr) [member function] cls.add_method('SetAddress', 'void', @@ -4125,6 +4130,11 @@ 'double', [param('double', 'fKhz')], is_pure_virtual=True, is_const=True, is_virtual=True) + ## uan-noise-model.h (module 'uan'): static ns3::TypeId ns3::UanNoiseModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3UanNoiseModelDefault_methods(root_module, cls): @@ -4209,6 +4219,11 @@ 'double', [], is_pure_virtual=True, is_virtual=True) + ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhy::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-phy.h (module 'uan'): bool ns3::UanPhy::IsStateBusy() [member function] cls.add_method('IsStateBusy', 'bool', @@ -4351,6 +4366,11 @@ 'void', [], is_virtual=True) + ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyCalcSinr::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-phy.h (module 'uan'): double ns3::UanPhyCalcSinr::KpToDb(double kp) const [member function] cls.add_method('KpToDb', 'double', @@ -4960,6 +4980,11 @@ 'void', [], is_virtual=True) + ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyPer::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3UanPhyPerGenDefault_methods(root_module, cls): @@ -5026,6 +5051,11 @@ 'ns3::UanPdp', [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b'), param('ns3::UanTxMode', 'mode')], is_pure_virtual=True, is_virtual=True) + ## uan-prop-model.h (module 'uan'): static ns3::TypeId ns3::UanPropModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3UanPropModelIdeal_methods(root_module, cls): @@ -5117,6 +5147,11 @@ 'ns3::UanTransducer::State', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## uan-transducer.h (module 'uan'): static ns3::TypeId ns3::UanTransducer::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-transducer.h (module 'uan'): bool ns3::UanTransducer::IsRx() const [member function] cls.add_method('IsRx', 'bool', diff -r 05504bcb5bae -r c94d841b44fb src/uan/bindings/modulegen__gcc_LP64.py --- a/src/uan/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/uan/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -3835,6 +3835,11 @@ 'ns3::Address', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## uan-mac.h (module 'uan'): static ns3::TypeId ns3::UanMac::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-mac.h (module 'uan'): void ns3::UanMac::SetAddress(ns3::UanAddress addr) [member function] cls.add_method('SetAddress', 'void', @@ -4125,6 +4130,11 @@ 'double', [param('double', 'fKhz')], is_pure_virtual=True, is_const=True, is_virtual=True) + ## uan-noise-model.h (module 'uan'): static ns3::TypeId ns3::UanNoiseModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3UanNoiseModelDefault_methods(root_module, cls): @@ -4209,6 +4219,11 @@ 'double', [], is_pure_virtual=True, is_virtual=True) + ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhy::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-phy.h (module 'uan'): bool ns3::UanPhy::IsStateBusy() [member function] cls.add_method('IsStateBusy', 'bool', @@ -4351,6 +4366,11 @@ 'void', [], is_virtual=True) + ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyCalcSinr::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-phy.h (module 'uan'): double ns3::UanPhyCalcSinr::KpToDb(double kp) const [member function] cls.add_method('KpToDb', 'double', @@ -4960,6 +4980,11 @@ 'void', [], is_virtual=True) + ## uan-phy.h (module 'uan'): static ns3::TypeId ns3::UanPhyPer::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3UanPhyPerGenDefault_methods(root_module, cls): @@ -5026,6 +5051,11 @@ 'ns3::UanPdp', [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b'), param('ns3::UanTxMode', 'mode')], is_pure_virtual=True, is_virtual=True) + ## uan-prop-model.h (module 'uan'): static ns3::TypeId ns3::UanPropModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3UanPropModelIdeal_methods(root_module, cls): @@ -5117,6 +5147,11 @@ 'ns3::UanTransducer::State', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## uan-transducer.h (module 'uan'): static ns3::TypeId ns3::UanTransducer::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## uan-transducer.h (module 'uan'): bool ns3::UanTransducer::IsRx() const [member function] cls.add_method('IsRx', 'bool', diff -r 05504bcb5bae -r c94d841b44fb src/visualizer/bindings/modulegen__gcc_ILP32.py --- a/src/visualizer/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/visualizer/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -136,6 +136,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2463,6 +2467,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2472,6 +2486,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2555,6 +2579,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/visualizer/bindings/modulegen__gcc_LP64.py --- a/src/visualizer/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/visualizer/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -136,6 +136,10 @@ module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## ipv4-header.h (module 'internet'): ns3::Ipv4Header [class] module.add_class('Ipv4Header', import_from_module='ns.internet', parent=root_module['ns3::Header']) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType [enumeration] + module.add_enum('DscpType', ['DscpDefault', 'CS1', 'AF11', 'AF12', 'AF13', 'CS2', 'AF21', 'AF22', 'AF23', 'CS3', 'AF31', 'AF32', 'AF33', 'CS4', 'AF41', 'AF42', 'AF43', 'CS5', 'EF', 'CS6', 'CS7'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType [enumeration] + module.add_enum('EcnType', ['NotECT', 'ECT1', 'ECT0', 'CE'], outer_class=root_module['ns3::Ipv4Header'], import_from_module='ns.internet') ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -2463,6 +2467,16 @@ 'uint32_t', [param('ns3::Buffer::Iterator', 'start')], is_virtual=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::DscpTypeToString(ns3::Ipv4Header::DscpType dscp) const [member function] + cls.add_method('DscpTypeToString', + 'std::string', + [param('ns3::Ipv4Header::DscpType', 'dscp')], + is_const=True) + ## ipv4-header.h (module 'internet'): std::string ns3::Ipv4Header::EcnTypeToString(ns3::Ipv4Header::EcnType ecn) const [member function] + cls.add_method('EcnTypeToString', + 'std::string', + [param('ns3::Ipv4Header::EcnType', 'ecn')], + is_const=True) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::EnableChecksum() [member function] cls.add_method('EnableChecksum', 'void', @@ -2472,6 +2486,16 @@ 'ns3::Ipv4Address', [], is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::DscpType ns3::Ipv4Header::GetDscp() const [member function] + cls.add_method('GetDscp', + 'ns3::Ipv4Header::DscpType', + [], + is_const=True) + ## ipv4-header.h (module 'internet'): ns3::Ipv4Header::EcnType ns3::Ipv4Header::GetEcn() const [member function] + cls.add_method('GetEcn', + 'ns3::Ipv4Header::EcnType', + [], + is_const=True) ## ipv4-header.h (module 'internet'): uint16_t ns3::Ipv4Header::GetFragmentOffset() const [member function] cls.add_method('GetFragmentOffset', 'uint16_t', @@ -2555,6 +2579,14 @@ cls.add_method('SetDontFragment', 'void', []) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetDscp(ns3::Ipv4Header::DscpType dscp) [member function] + cls.add_method('SetDscp', + 'void', + [param('ns3::Ipv4Header::DscpType', 'dscp')]) + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetEcn(ns3::Ipv4Header::EcnType ecn) [member function] + cls.add_method('SetEcn', + 'void', + [param('ns3::Ipv4Header::EcnType', 'ecn')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', diff -r 05504bcb5bae -r c94d841b44fb src/wifi/bindings/modulegen__gcc_ILP32.py --- a/src/wifi/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -4110,6 +4110,7 @@ return def register_Ns3Int64x64_t_methods(root_module, cls): + cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_binary_comparison_operator('!=') cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right')) @@ -4163,7 +4164,6 @@ cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right')) - cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right')) cls.add_output_stream_operator() @@ -5366,12 +5366,12 @@ return def register_Ns3Time_methods(root_module, cls): + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_binary_comparison_operator('!=') 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')) cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') diff -r 05504bcb5bae -r c94d841b44fb src/wimax/bindings/callbacks_list.py --- a/src/wimax/bindings/callbacks_list.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/wimax/bindings/callbacks_list.py Mon Nov 14 13:00:58 2011 -0800 @@ -4,5 +4,5 @@ ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'bool', 'unsigned long long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'bool', 'unsigned long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ] diff -r 05504bcb5bae -r c94d841b44fb src/wimax/bindings/modulegen__gcc_ILP32.py --- a/src/wimax/bindings/modulegen__gcc_ILP32.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/wimax/bindings/modulegen__gcc_ILP32.py Mon Nov 14 13:00:58 2011 -0800 @@ -4798,6 +4798,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right')) @@ -4850,7 +4851,6 @@ cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right')) - cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right')) cls.add_output_stream_operator() @@ -6410,11 +6410,11 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) 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')) cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') diff -r 05504bcb5bae -r c94d841b44fb src/wimax/bindings/modulegen__gcc_LP64.py --- a/src/wimax/bindings/modulegen__gcc_LP64.py Mon Nov 14 19:47:37 2011 +0000 +++ b/src/wimax/bindings/modulegen__gcc_LP64.py Mon Nov 14 13:00:58 2011 -0800 @@ -6130,6 +6130,11 @@ 'std::vector< ns3::SSRecord * > *', [], is_const=True) + ## ss-manager.h (module 'wimax'): static ns3::TypeId ns3::SSManager::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## ss-manager.h (module 'wimax'): bool ns3::SSManager::IsInRecord(ns3::Mac48Address const & macAddress) const [member function] cls.add_method('IsInRecord', 'bool', @@ -6197,6 +6202,11 @@ 'std::vector< ns3::ServiceFlow * >', [param('ns3::ServiceFlow::SchedulingType', 'schedulingType')], is_const=True) + ## service-flow-manager.h (module 'wimax'): static ns3::TypeId ns3::ServiceFlowManager::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3SfVectorTlvValue_methods(root_module, cls): @@ -8547,6 +8557,11 @@ 'uint32_t', [param('ns3::Cid::Type', 'type'), param('ns3::ServiceFlow::SchedulingType', 'schedulingType')], is_const=True) + ## connection-manager.h (module 'wimax'): static ns3::TypeId ns3::ConnectionManager::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## connection-manager.h (module 'wimax'): bool ns3::ConnectionManager::HasPackets() const [member function] cls.add_method('HasPackets', 'bool', @@ -9300,6 +9315,11 @@ cls.add_method('Classify', 'ns3::ServiceFlow *', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::ServiceFlowManager >', 'sfm'), param('ns3::ServiceFlow::Direction', 'dir')]) + ## ipcs-classifier.h (module 'wimax'): static ns3::TypeId ns3::IpcsClassifier::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) return def register_Ns3Ipv4AddressChecker_methods(root_module, cls): @@ -10408,6 +10428,11 @@ 'uint32_t', [], is_const=True, is_virtual=True) + ## wimax-channel.h (module 'wimax'): static ns3::TypeId ns3::WimaxChannel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## wimax-channel.h (module 'wimax'): void ns3::WimaxChannel::DoAttach(ns3::Ptr phy) [member function] cls.add_method('DoAttach', 'void',