# HG changeset patch # User Mitch Watrous # Date 1372973255 25200 # Node ID 9a100979b2df0638fcd6ded7829644ba784d8014 # Parent 0799c5d3505f1ecaafb0e33fd3985f0f0c6cb216 Updatemany modules' Python bindings diff -r 0799c5d3505f -r 9a100979b2df src/aodv/bindings/modulegen__gcc_ILP32.py --- a/src/aodv/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/aodv/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -136,6 +136,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -352,8 +354,6 @@ module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -555,7 +555,6 @@ register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2205,6 +2204,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4159,6 +4162,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -7054,6 +7067,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -7108,13 +7125,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/aodv/bindings/modulegen__gcc_LP64.py --- a/src/aodv/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/aodv/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -136,6 +136,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -352,8 +354,6 @@ module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -555,7 +555,6 @@ register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2205,6 +2204,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4159,6 +4162,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -7054,6 +7067,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -7108,13 +7125,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/applications/bindings/modulegen__gcc_ILP32.py --- a/src/applications/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/applications/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -442,8 +442,6 @@ module.add_class('SimpleChannel', import_from_module='ns.network', parent=root_module['ns3::Channel']) ## simple-net-device.h (module 'network'): ns3::SimpleNetDevice [class] module.add_class('SimpleNetDevice', import_from_module='ns.network', parent=root_module['ns3::NetDevice']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -475,6 +473,9 @@ module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::Socket > >', 'ns3::Ptr< ns3::Socket >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::RadvdPrefix > >', 'ns3::Ptr< ns3::RadvdPrefix >', container_type='list') + 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::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&') @@ -490,9 +491,6 @@ 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('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&') @@ -705,7 +703,6 @@ register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -5695,6 +5692,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -9605,13 +9612,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/applications/bindings/modulegen__gcc_LP64.py --- a/src/applications/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/applications/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -442,8 +442,6 @@ module.add_class('SimpleChannel', import_from_module='ns.network', parent=root_module['ns3::Channel']) ## simple-net-device.h (module 'network'): ns3::SimpleNetDevice [class] module.add_class('SimpleNetDevice', import_from_module='ns.network', parent=root_module['ns3::NetDevice']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -475,6 +473,9 @@ module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::Socket > >', 'ns3::Ptr< ns3::Socket >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::RadvdPrefix > >', 'ns3::Ptr< ns3::RadvdPrefix >', container_type='list') + 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::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&') @@ -490,9 +491,6 @@ 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('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&') @@ -705,7 +703,6 @@ register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -5695,6 +5692,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -9605,13 +9612,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/bridge/bindings/modulegen__gcc_ILP32.py --- a/src/bridge/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/bridge/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -138,8 +138,6 @@ module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class] module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -217,7 +215,6 @@ register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1626,6 +1623,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2234,13 +2241,6 @@ [param('ns3::ObjectFactory const &', 'value')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/bridge/bindings/modulegen__gcc_LP64.py --- a/src/bridge/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/bridge/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -138,8 +138,6 @@ module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class] module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -217,7 +215,6 @@ register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1626,6 +1623,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2234,13 +2241,6 @@ [param('ns3::ObjectFactory const &', 'value')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/buildings/bindings/modulegen__gcc_ILP32.py --- a/src/buildings/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/buildings/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -244,8 +244,6 @@ module.add_class('OhBuildingsPropagationLossModel', parent=root_module['ns3::BuildingsPropagationLossModel']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -389,7 +387,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OhBuildingsPropagationLossModel_methods(root_module, root_module['ns3::OhBuildingsPropagationLossModel']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2321,6 +2318,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2421,14 +2428,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -2442,8 +2445,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -3201,14 +3204,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -3222,8 +3221,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -4163,13 +4162,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/buildings/bindings/modulegen__gcc_LP64.py --- a/src/buildings/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/buildings/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -244,8 +244,6 @@ module.add_class('OhBuildingsPropagationLossModel', parent=root_module['ns3::BuildingsPropagationLossModel']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -389,7 +387,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OhBuildingsPropagationLossModel_methods(root_module, root_module['ns3::OhBuildingsPropagationLossModel']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2321,6 +2318,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2421,14 +2428,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -2442,8 +2445,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -3201,14 +3204,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -3222,8 +3221,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -4163,13 +4162,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/core/bindings/callbacks_list.py --- a/src/core/bindings/callbacks_list.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/core/bindings/callbacks_list.py Thu Jul 04 14:27:35 2013 -0700 @@ -1,5 +1,5 @@ callback_classes = [ - ['void', 'unsigned char*', 'long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'unsigned char*', 'int', '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'], ['bool', 'std::string', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ] diff -r 0799c5d3505f -r 9a100979b2df src/core/bindings/modulegen__gcc_ILP32.py --- a/src/core/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/core/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -32,6 +32,8 @@ module.add_class('CommandLine', allow_subclassing=True) ## system-mutex.h (module 'core'): ns3::CriticalSection [class] module.add_class('CriticalSection') + ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector [class] + module.add_class('EventGarbageCollector') ## event-id.h (module 'core'): ns3::EventId [class] module.add_class('EventId') ## global-value.h (module 'core'): ns3::GlobalValue [class] @@ -76,6 +78,8 @@ module.add_class('ObjectFactory') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable') + ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper [class] + module.add_class('RandomVariableStreamHelper') ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] module.add_class('RngSeedManager') ## rng-stream.h (module 'core'): ns3::RngStream [class] @@ -292,8 +296,6 @@ module.add_class('StringChecker', parent=root_module['ns3::AttributeChecker']) ## string.h (module 'core'): ns3::StringValue [class] module.add_class('StringValue', parent=root_module['ns3::AttributeValue']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -310,6 +312,10 @@ module.add_class('Vector3DChecker', parent=root_module['ns3::AttributeChecker']) ## vector.h (module 'core'): ns3::Vector3DValue [class] module.add_class('Vector3DValue', parent=root_module['ns3::AttributeValue']) + typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') + typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') + typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') + module.add_typedef(root_module['ns3::Vector3D'], 'Vector') typehandlers.add_type_alias('ns3::ObjectPtrContainerValue', 'ns3::ObjectVectorValue') typehandlers.add_type_alias('ns3::ObjectPtrContainerValue*', 'ns3::ObjectVectorValue*') typehandlers.add_type_alias('ns3::ObjectPtrContainerValue&', 'ns3::ObjectVectorValue&') @@ -324,10 +330,6 @@ typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') - typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') - typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') - typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') - module.add_typedef(root_module['ns3::Vector3D'], 'Vector') typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue') typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') @@ -341,6 +343,12 @@ typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') + ## Register a nested module for the namespace CommandLineHelper + + nested_module = module.add_cpp_namespace('CommandLineHelper') + register_types_ns3_CommandLineHelper(nested_module) + + ## Register a nested module for the namespace Config nested_module = module.add_cpp_namespace('Config') @@ -365,6 +373,10 @@ register_types_ns3_internal(nested_module) +def register_types_ns3_CommandLineHelper(module): + root_module = module.get_root() + + def register_types_ns3_Config(module): root_module = module.get_root() @@ -392,6 +404,7 @@ register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) register_Ns3CommandLine_methods(root_module, root_module['ns3::CommandLine']) register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection']) + register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector']) register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) register_Ns3GlobalValue_methods(root_module, root_module['ns3::GlobalValue']) register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >']) @@ -407,6 +420,7 @@ register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RandomVariableStreamHelper_methods(root_module, root_module['ns3::RandomVariableStreamHelper']) register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) @@ -509,7 +523,6 @@ register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase']) register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker']) register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -589,6 +602,19 @@ cls.add_method('AddValue', 'void', [param('std::string const &', 'name'), param('std::string const &', 'help'), param('ns3::Callback< bool, std::string, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) + ## command-line.h (module 'core'): std::string ns3::CommandLine::GetName() const [member function] + cls.add_method('GetName', + 'std::string', + [], + is_const=True) + ## command-line.h (module 'core'): void ns3::CommandLine::Parse(int argc, char * * argv) [member function] + cls.add_method('Parse', + 'void', + [param('int', 'argc'), param('char * *', 'argv')]) + ## command-line.h (module 'core'): void ns3::CommandLine::Usage(std::string const usage) [member function] + cls.add_method('Usage', + 'void', + [param('std::string const', 'usage')]) return def register_Ns3CriticalSection_methods(root_module, cls): @@ -598,6 +624,17 @@ cls.add_constructor([param('ns3::SystemMutex &', 'mutex')]) return +def register_Ns3EventGarbageCollector_methods(root_module, cls): + ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EventGarbageCollector const &', 'arg0')]) + ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor] + cls.add_constructor([]) + ## event-garbage-collector.h (module 'core'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function] + cls.add_method('Track', + 'void', + [param('ns3::EventId', 'event')]) + return + def register_Ns3EventId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('==') @@ -975,6 +1012,18 @@ is_const=True) return +def register_Ns3RandomVariableStreamHelper_methods(root_module, cls): + ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper() [constructor] + cls.add_constructor([]) + ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper(ns3::RandomVariableStreamHelper const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RandomVariableStreamHelper const &', 'arg0')]) + ## random-variable-stream-helper.h (module 'core'): static int64_t ns3::RandomVariableStreamHelper::AssignStreams(std::string path, int64_t stream) [member function] + cls.add_method('AssignStreams', + 'int64_t', + [param('std::string', 'path'), param('int64_t', 'stream')], + is_static=True) + return + def register_Ns3RngSeedManager_methods(root_module, cls): ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) @@ -2477,6 +2526,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4203,13 +4262,6 @@ [param('std::string const &', 'value')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) @@ -4559,10 +4611,18 @@ module.add_function('MakeStringChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## nstime.h (module 'core'): extern ns3::Ptr ns3::MakeTimeChecker() [free function] + ## nstime.h (module 'core'): ns3::Ptr ns3::MakeTimeChecker() [free function] module.add_function('MakeTimeChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) + ## nstime.h (module 'core'): ns3::Ptr ns3::MakeTimeChecker(ns3::Time const min) [free function] + module.add_function('MakeTimeChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('ns3::Time const', 'min')]) + ## nstime.h (module 'core'): extern ns3::Ptr ns3::MakeTimeChecker(ns3::Time const min, ns3::Time const max) [free function] + module.add_function('MakeTimeChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('ns3::Time const', 'min'), param('ns3::Time const', 'max')]) ## type-id.h (module 'core'): extern ns3::Ptr ns3::MakeTypeIdChecker() [free function] module.add_function('MakeTypeIdChecker', 'ns3::Ptr< ns3::AttributeChecker const >', @@ -4697,12 +4757,21 @@ 'std::string', [], template_parameters=['unsigned char']) + register_functions_ns3_CommandLineHelper(module.get_submodule('CommandLineHelper'), root_module) 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 +def register_functions_ns3_CommandLineHelper(module, root_module): + ## command-line.h (module 'core'): extern bool ns3::CommandLineHelper::UserItemParse(std::string const value, bool & val) [free function] + module.add_function('UserItemParse', + 'bool', + [param('std::string const', 'value'), param('bool &', 'val')], + template_parameters=['bool']) + return + def register_functions_ns3_Config(module, root_module): ## config.h (module 'core'): extern void ns3::Config::Connect(std::string path, ns3::CallbackBase const & cb) [free function] module.add_function('Connect', diff -r 0799c5d3505f -r 9a100979b2df src/core/bindings/modulegen__gcc_LP64.py --- a/src/core/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/core/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -32,6 +32,8 @@ module.add_class('CommandLine', allow_subclassing=True) ## system-mutex.h (module 'core'): ns3::CriticalSection [class] module.add_class('CriticalSection') + ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector [class] + module.add_class('EventGarbageCollector') ## event-id.h (module 'core'): ns3::EventId [class] module.add_class('EventId') ## global-value.h (module 'core'): ns3::GlobalValue [class] @@ -76,6 +78,8 @@ module.add_class('ObjectFactory') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable') + ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper [class] + module.add_class('RandomVariableStreamHelper') ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] module.add_class('RngSeedManager') ## rng-stream.h (module 'core'): ns3::RngStream [class] @@ -292,8 +296,6 @@ module.add_class('StringChecker', parent=root_module['ns3::AttributeChecker']) ## string.h (module 'core'): ns3::StringValue [class] module.add_class('StringValue', parent=root_module['ns3::AttributeValue']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -310,6 +312,10 @@ module.add_class('Vector3DChecker', parent=root_module['ns3::AttributeChecker']) ## vector.h (module 'core'): ns3::Vector3DValue [class] module.add_class('Vector3DValue', parent=root_module['ns3::AttributeValue']) + typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') + typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') + typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') + module.add_typedef(root_module['ns3::Vector3D'], 'Vector') typehandlers.add_type_alias('ns3::ObjectPtrContainerValue', 'ns3::ObjectVectorValue') typehandlers.add_type_alias('ns3::ObjectPtrContainerValue*', 'ns3::ObjectVectorValue*') typehandlers.add_type_alias('ns3::ObjectPtrContainerValue&', 'ns3::ObjectVectorValue&') @@ -324,10 +330,6 @@ typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') - typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') - typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') - typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') - module.add_typedef(root_module['ns3::Vector3D'], 'Vector') typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue') typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') @@ -341,6 +343,12 @@ typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') + ## Register a nested module for the namespace CommandLineHelper + + nested_module = module.add_cpp_namespace('CommandLineHelper') + register_types_ns3_CommandLineHelper(nested_module) + + ## Register a nested module for the namespace Config nested_module = module.add_cpp_namespace('Config') @@ -365,6 +373,10 @@ register_types_ns3_internal(nested_module) +def register_types_ns3_CommandLineHelper(module): + root_module = module.get_root() + + def register_types_ns3_Config(module): root_module = module.get_root() @@ -392,6 +404,7 @@ register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) register_Ns3CommandLine_methods(root_module, root_module['ns3::CommandLine']) register_Ns3CriticalSection_methods(root_module, root_module['ns3::CriticalSection']) + register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector']) register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) register_Ns3GlobalValue_methods(root_module, root_module['ns3::GlobalValue']) register_Ns3IntToType__0_methods(root_module, root_module['ns3::IntToType< 0 >']) @@ -407,6 +420,7 @@ register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RandomVariableStreamHelper_methods(root_module, root_module['ns3::RandomVariableStreamHelper']) register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) @@ -509,7 +523,6 @@ register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase']) register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker']) register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -589,6 +602,19 @@ cls.add_method('AddValue', 'void', [param('std::string const &', 'name'), param('std::string const &', 'help'), param('ns3::Callback< bool, std::string, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) + ## command-line.h (module 'core'): std::string ns3::CommandLine::GetName() const [member function] + cls.add_method('GetName', + 'std::string', + [], + is_const=True) + ## command-line.h (module 'core'): void ns3::CommandLine::Parse(int argc, char * * argv) [member function] + cls.add_method('Parse', + 'void', + [param('int', 'argc'), param('char * *', 'argv')]) + ## command-line.h (module 'core'): void ns3::CommandLine::Usage(std::string const usage) [member function] + cls.add_method('Usage', + 'void', + [param('std::string const', 'usage')]) return def register_Ns3CriticalSection_methods(root_module, cls): @@ -598,6 +624,17 @@ cls.add_constructor([param('ns3::SystemMutex &', 'mutex')]) return +def register_Ns3EventGarbageCollector_methods(root_module, cls): + ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector(ns3::EventGarbageCollector const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EventGarbageCollector const &', 'arg0')]) + ## event-garbage-collector.h (module 'core'): ns3::EventGarbageCollector::EventGarbageCollector() [constructor] + cls.add_constructor([]) + ## event-garbage-collector.h (module 'core'): void ns3::EventGarbageCollector::Track(ns3::EventId event) [member function] + cls.add_method('Track', + 'void', + [param('ns3::EventId', 'event')]) + return + def register_Ns3EventId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('==') @@ -975,6 +1012,18 @@ is_const=True) return +def register_Ns3RandomVariableStreamHelper_methods(root_module, cls): + ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper() [constructor] + cls.add_constructor([]) + ## random-variable-stream-helper.h (module 'core'): ns3::RandomVariableStreamHelper::RandomVariableStreamHelper(ns3::RandomVariableStreamHelper const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RandomVariableStreamHelper const &', 'arg0')]) + ## random-variable-stream-helper.h (module 'core'): static int64_t ns3::RandomVariableStreamHelper::AssignStreams(std::string path, int64_t stream) [member function] + cls.add_method('AssignStreams', + 'int64_t', + [param('std::string', 'path'), param('int64_t', 'stream')], + is_static=True) + return + def register_Ns3RngSeedManager_methods(root_module, cls): ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) @@ -2477,6 +2526,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4203,13 +4262,6 @@ [param('std::string const &', 'value')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) @@ -4559,10 +4611,18 @@ module.add_function('MakeStringChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## nstime.h (module 'core'): extern ns3::Ptr ns3::MakeTimeChecker() [free function] + ## nstime.h (module 'core'): ns3::Ptr ns3::MakeTimeChecker() [free function] module.add_function('MakeTimeChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) + ## nstime.h (module 'core'): ns3::Ptr ns3::MakeTimeChecker(ns3::Time const min) [free function] + module.add_function('MakeTimeChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('ns3::Time const', 'min')]) + ## nstime.h (module 'core'): extern ns3::Ptr ns3::MakeTimeChecker(ns3::Time const min, ns3::Time const max) [free function] + module.add_function('MakeTimeChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('ns3::Time const', 'min'), param('ns3::Time const', 'max')]) ## type-id.h (module 'core'): extern ns3::Ptr ns3::MakeTypeIdChecker() [free function] module.add_function('MakeTypeIdChecker', 'ns3::Ptr< ns3::AttributeChecker const >', @@ -4697,12 +4757,21 @@ 'std::string', [], template_parameters=['unsigned char']) + register_functions_ns3_CommandLineHelper(module.get_submodule('CommandLineHelper'), root_module) 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 +def register_functions_ns3_CommandLineHelper(module, root_module): + ## command-line.h (module 'core'): extern bool ns3::CommandLineHelper::UserItemParse(std::string const value, bool & val) [free function] + module.add_function('UserItemParse', + 'bool', + [param('std::string const', 'value'), param('bool &', 'val')], + template_parameters=['bool']) + return + def register_functions_ns3_Config(module, root_module): ## config.h (module 'core'): extern void ns3::Config::Connect(std::string path, ns3::CallbackBase const & cb) [free function] module.add_function('Connect', diff -r 0799c5d3505f -r 9a100979b2df src/csma-layout/bindings/modulegen__gcc_ILP32.py --- a/src/csma-layout/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/csma-layout/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -156,6 +156,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -350,8 +352,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -509,7 +509,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2652,6 +2651,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4946,6 +4949,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -7074,6 +7087,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -7085,13 +7102,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/csma-layout/bindings/modulegen__gcc_LP64.py --- a/src/csma-layout/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/csma-layout/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -156,6 +156,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -350,8 +352,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -509,7 +509,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2652,6 +2651,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4946,6 +4949,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -7074,6 +7087,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -7085,13 +7102,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/csma/bindings/modulegen__gcc_ILP32.py --- a/src/csma/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/csma/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -100,6 +100,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -274,8 +276,6 @@ module.add_enum('ErrorUnit', ['ERROR_UNIT_BIT', 'ERROR_UNIT_BYTE', 'ERROR_UNIT_PACKET'], outer_class=root_module['ns3::RateErrorModel'], import_from_module='ns.network') ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class] module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -419,7 +419,6 @@ register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2017,6 +2016,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3340,6 +3343,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4997,6 +5010,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5145,13 +5162,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/csma/bindings/modulegen__gcc_LP64.py --- a/src/csma/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/csma/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -100,6 +100,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -274,8 +276,6 @@ module.add_enum('ErrorUnit', ['ERROR_UNIT_BIT', 'ERROR_UNIT_BYTE', 'ERROR_UNIT_PACKET'], outer_class=root_module['ns3::RateErrorModel'], import_from_module='ns.network') ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class] module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -419,7 +419,6 @@ register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2017,6 +2016,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3340,6 +3343,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4997,6 +5010,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5145,13 +5162,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/dsdv/bindings/modulegen__gcc_ILP32.py --- a/src/dsdv/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/dsdv/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -130,6 +130,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -328,8 +330,6 @@ module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -503,7 +503,6 @@ register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2073,6 +2072,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4023,6 +4026,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6234,6 +6247,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -6288,13 +6305,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/dsdv/bindings/modulegen__gcc_LP64.py --- a/src/dsdv/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/dsdv/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -130,6 +130,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -328,8 +330,6 @@ module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -503,7 +503,6 @@ register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2073,6 +2072,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4023,6 +4026,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6234,6 +6247,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -6288,13 +6305,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/dsr/bindings/modulegen__gcc_ILP32.py --- a/src/dsr/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/dsr/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -416,8 +416,6 @@ module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue']) ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class] module.add_class('TcpL4Protocol', import_from_module='ns.internet', parent=root_module['ns3::IpL4Protocol']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -752,7 +750,6 @@ register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker']) register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -4826,6 +4823,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -8927,13 +8934,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/dsr/bindings/modulegen__gcc_LP64.py --- a/src/dsr/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/dsr/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -416,8 +416,6 @@ module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue']) ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class] module.add_class('TcpL4Protocol', import_from_module='ns.internet', parent=root_module['ns3::IpL4Protocol']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -752,7 +750,6 @@ register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker']) register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -4826,6 +4823,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -8927,13 +8934,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/emu/bindings/modulegen__gcc_ILP32.py --- a/src/emu/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/emu/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -96,6 +96,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -226,8 +228,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -347,7 +347,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1895,6 +1894,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3061,6 +3064,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4049,6 +4062,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -4060,13 +4077,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/emu/bindings/modulegen__gcc_LP64.py --- a/src/emu/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/emu/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -96,6 +96,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -226,8 +228,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -347,7 +347,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1895,6 +1894,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3061,6 +3064,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4049,6 +4062,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -4060,13 +4077,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/energy/bindings/modulegen__gcc_ILP32.py --- a/src/energy/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/energy/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -98,6 +98,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## rv-battery-model-helper.h (module 'energy'): ns3::RvBatteryModelHelper [class] module.add_class('RvBatteryModelHelper', parent=root_module['ns3::EnergySourceHelper']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -244,8 +246,6 @@ module.add_class('RvBatteryModel', parent=root_module['ns3::EnergySource']) ## simple-device-energy-model.h (module 'energy'): ns3::SimpleDeviceEnergyModel [class] module.add_class('SimpleDeviceEnergyModel', parent=root_module['ns3::DeviceEnergyModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -392,7 +392,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3RvBatteryModel_methods(root_module, root_module['ns3::RvBatteryModel']) register_Ns3SimpleDeviceEnergyModel_methods(root_module, root_module['ns3::SimpleDeviceEnergyModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1831,6 +1830,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2827,6 +2830,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4572,6 +4585,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -4749,13 +4766,6 @@ is_const=True, visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/energy/bindings/modulegen__gcc_LP64.py --- a/src/energy/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/energy/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -98,6 +98,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## rv-battery-model-helper.h (module 'energy'): ns3::RvBatteryModelHelper [class] module.add_class('RvBatteryModelHelper', parent=root_module['ns3::EnergySourceHelper']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -244,8 +246,6 @@ module.add_class('RvBatteryModel', parent=root_module['ns3::EnergySource']) ## simple-device-energy-model.h (module 'energy'): ns3::SimpleDeviceEnergyModel [class] module.add_class('SimpleDeviceEnergyModel', parent=root_module['ns3::DeviceEnergyModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -392,7 +392,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3RvBatteryModel_methods(root_module, root_module['ns3::RvBatteryModel']) register_Ns3SimpleDeviceEnergyModel_methods(root_module, root_module['ns3::SimpleDeviceEnergyModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1831,6 +1830,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2827,6 +2830,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4572,6 +4585,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -4749,13 +4766,6 @@ is_const=True, visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/fd-net-device/bindings/modulegen__gcc_ILP32.py --- a/src/fd-net-device/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/fd-net-device/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -96,6 +96,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -234,12 +236,8 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper [class] - module.add_class('PlanetLabFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper']) ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper [class] module.add_class('TapFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -365,9 +363,7 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, root_module['ns3::PlanetLabFdNetDeviceHelper']) register_Ns3TapFdNetDeviceHelper_methods(root_module, root_module['ns3::TapFdNetDeviceHelper']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1916,6 +1912,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3126,6 +3126,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4164,6 +4174,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -4175,36 +4189,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, cls): - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper(ns3::PlanetLabFdNetDeviceHelper const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PlanetLabFdNetDeviceHelper const &', 'arg0')]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper() [constructor] - cls.add_constructor([]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapIpAddress(ns3::Ipv4Address address) [member function] - cls.add_method('SetTapIpAddress', - 'void', - [param('ns3::Ipv4Address', 'address')]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapMask(ns3::Ipv4Mask mask) [member function] - cls.add_method('SetTapMask', - 'void', - [param('ns3::Ipv4Mask', 'mask')]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): int ns3::PlanetLabFdNetDeviceHelper::CreateFileDescriptor() const [member function] - cls.add_method('CreateFileDescriptor', - 'int', - [], - is_const=True, visibility='protected', is_virtual=True) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::Ptr ns3::PlanetLabFdNetDeviceHelper::InstallPriv(ns3::Ptr node) const [member function] - cls.add_method('InstallPriv', - 'ns3::Ptr< ns3::NetDevice >', - [param('ns3::Ptr< ns3::Node >', 'node')], - is_const=True, visibility='protected', is_virtual=True) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetFileDescriptor(ns3::Ptr device) const [member function] - cls.add_method('SetFileDescriptor', - 'void', - [param('ns3::Ptr< ns3::FdNetDevice >', 'device')], - is_const=True, visibility='protected', is_virtual=True) - return - def register_Ns3TapFdNetDeviceHelper_methods(root_module, cls): ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper::TapFdNetDeviceHelper(ns3::TapFdNetDeviceHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::TapFdNetDeviceHelper const &', 'arg0')]) @@ -4251,13 +4235,6 @@ is_const=True, visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/fd-net-device/bindings/modulegen__gcc_LP64.py --- a/src/fd-net-device/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/fd-net-device/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -96,6 +96,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -234,12 +236,8 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper [class] - module.add_class('PlanetLabFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper']) ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper [class] module.add_class('TapFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -365,9 +363,7 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, root_module['ns3::PlanetLabFdNetDeviceHelper']) register_Ns3TapFdNetDeviceHelper_methods(root_module, root_module['ns3::TapFdNetDeviceHelper']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1916,6 +1912,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3126,6 +3126,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4164,6 +4174,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -4175,36 +4189,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, cls): - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper(ns3::PlanetLabFdNetDeviceHelper const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PlanetLabFdNetDeviceHelper const &', 'arg0')]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper() [constructor] - cls.add_constructor([]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapIpAddress(ns3::Ipv4Address address) [member function] - cls.add_method('SetTapIpAddress', - 'void', - [param('ns3::Ipv4Address', 'address')]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapMask(ns3::Ipv4Mask mask) [member function] - cls.add_method('SetTapMask', - 'void', - [param('ns3::Ipv4Mask', 'mask')]) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): int ns3::PlanetLabFdNetDeviceHelper::CreateFileDescriptor() const [member function] - cls.add_method('CreateFileDescriptor', - 'int', - [], - is_const=True, visibility='protected', is_virtual=True) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::Ptr ns3::PlanetLabFdNetDeviceHelper::InstallPriv(ns3::Ptr node) const [member function] - cls.add_method('InstallPriv', - 'ns3::Ptr< ns3::NetDevice >', - [param('ns3::Ptr< ns3::Node >', 'node')], - is_const=True, visibility='protected', is_virtual=True) - ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetFileDescriptor(ns3::Ptr device) const [member function] - cls.add_method('SetFileDescriptor', - 'void', - [param('ns3::Ptr< ns3::FdNetDevice >', 'device')], - is_const=True, visibility='protected', is_virtual=True) - return - def register_Ns3TapFdNetDeviceHelper_methods(root_module, cls): ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper::TapFdNetDeviceHelper(ns3::TapFdNetDeviceHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::TapFdNetDeviceHelper const &', 'arg0')]) @@ -4251,13 +4235,6 @@ is_const=True, visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/flow-monitor/bindings/modulegen__gcc_ILP32.py --- a/src/flow-monitor/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/flow-monitor/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -132,6 +132,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -314,8 +316,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -467,7 +467,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2069,6 +2068,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3927,6 +3930,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5809,6 +5822,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5820,13 +5837,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/flow-monitor/bindings/modulegen__gcc_LP64.py --- a/src/flow-monitor/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/flow-monitor/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -132,6 +132,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -314,8 +316,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -467,7 +467,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2069,6 +2068,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3927,6 +3930,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5809,6 +5822,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5820,13 +5837,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/internet/bindings/modulegen__gcc_ILP32.py --- a/src/internet/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/internet/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -644,8 +644,6 @@ module.add_class('TcpReno', parent=root_module['ns3::TcpSocketBase']) ## tcp-rfc793.h (module 'internet'): ns3::TcpRfc793 [class] module.add_class('TcpRfc793', parent=root_module['ns3::TcpSocketBase']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -975,7 +973,6 @@ register_Ns3TcpNewReno_methods(root_module, root_module['ns3::TcpNewReno']) register_Ns3TcpReno_methods(root_module, root_module['ns3::TcpReno']) register_Ns3TcpRfc793_methods(root_module, root_module['ns3::TcpRfc793']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -9504,6 +9501,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -13251,10 +13258,10 @@ 'void', [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] + ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] cls.add_method('RouteInput', 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], + [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], is_pure_virtual=True, is_virtual=True) ## ipv6-routing-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv6RoutingProtocol::RouteOutput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr oif, ns3::Socket::SocketErrno & sockerr) [member function] cls.add_method('RouteOutput', @@ -13386,10 +13393,10 @@ cls.add_method('RemoveRoute', 'void', [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('uint32_t', 'ifIndex'), param('ns3::Ipv6Address', 'prefixToUse')]) - ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] + ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] cls.add_method('RouteInput', 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], + [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], is_virtual=True) ## ipv6-static-routing.h (module 'internet'): ns3::Ptr ns3::Ipv6StaticRouting::RouteOutput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr oif, ns3::Socket::SocketErrno & sockerr) [member function] cls.add_method('RouteOutput', @@ -14615,13 +14622,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) @@ -15634,10 +15634,10 @@ 'void', [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], is_const=True, is_virtual=True) - ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] + ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] cls.add_method('RouteInput', 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], + [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], is_virtual=True) ## ipv6-list-routing.h (module 'internet'): ns3::Ptr ns3::Ipv6ListRouting::RouteOutput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr oif, ns3::Socket::SocketErrno & sockerr) [member function] cls.add_method('RouteOutput', diff -r 0799c5d3505f -r 9a100979b2df src/internet/bindings/modulegen__gcc_LP64.py --- a/src/internet/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/internet/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -644,8 +644,6 @@ module.add_class('TcpReno', parent=root_module['ns3::TcpSocketBase']) ## tcp-rfc793.h (module 'internet'): ns3::TcpRfc793 [class] module.add_class('TcpRfc793', parent=root_module['ns3::TcpSocketBase']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -975,7 +973,6 @@ register_Ns3TcpNewReno_methods(root_module, root_module['ns3::TcpNewReno']) register_Ns3TcpReno_methods(root_module, root_module['ns3::TcpReno']) register_Ns3TcpRfc793_methods(root_module, root_module['ns3::TcpRfc793']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -9504,6 +9501,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -13251,10 +13258,10 @@ 'void', [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] + ## ipv6-routing-protocol.h (module 'internet'): bool ns3::Ipv6RoutingProtocol::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] cls.add_method('RouteInput', 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], + [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], is_pure_virtual=True, is_virtual=True) ## ipv6-routing-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv6RoutingProtocol::RouteOutput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr oif, ns3::Socket::SocketErrno & sockerr) [member function] cls.add_method('RouteOutput', @@ -13386,10 +13393,10 @@ cls.add_method('RemoveRoute', 'void', [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('uint32_t', 'ifIndex'), param('ns3::Ipv6Address', 'prefixToUse')]) - ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] + ## ipv6-static-routing.h (module 'internet'): bool ns3::Ipv6StaticRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] cls.add_method('RouteInput', 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], + [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], is_virtual=True) ## ipv6-static-routing.h (module 'internet'): ns3::Ptr ns3::Ipv6StaticRouting::RouteOutput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr oif, ns3::Socket::SocketErrno & sockerr) [member function] cls.add_method('RouteOutput', @@ -14615,13 +14622,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) @@ -15634,10 +15634,10 @@ 'void', [param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], is_const=True, is_virtual=True) - ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] + ## ipv6-list-routing.h (module 'internet'): bool ns3::Ipv6ListRouting::RouteInput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,ns3::Ptr,const ns3::Ipv6Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv6Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv6Header&,ns3::Socket::SocketErrno,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] cls.add_method('RouteInput', 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], + [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv6Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice const >, ns3::Ptr< ns3::Ipv6MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv6Header const &, ns3::Socket::SocketErrno, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], is_virtual=True) ## ipv6-list-routing.h (module 'internet'): ns3::Ptr ns3::Ipv6ListRouting::RouteOutput(ns3::Ptr p, ns3::Ipv6Header const & header, ns3::Ptr oif, ns3::Socket::SocketErrno & sockerr) [member function] cls.add_method('RouteOutput', diff -r 0799c5d3505f -r 9a100979b2df src/lte/bindings/modulegen__gcc_ILP32.py --- a/src/lte/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/lte/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -618,6 +618,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## ff-mac-common.h (module 'lte'): ns3::PagingInfoListElement_s [struct] module.add_class('PagingInfoListElement_s') ## ff-mac-common.h (module 'lte'): ns3::PhichListElement_s [struct] @@ -1196,8 +1198,6 @@ module.add_class('TdMtFfMacScheduler', parent=root_module['ns3::FfMacScheduler']) ## tdtbfq-ff-mac-scheduler.h (module 'lte'): ns3::TdTbfqFfMacScheduler [class] module.add_class('TdTbfqFfMacScheduler', parent=root_module['ns3::FfMacScheduler']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## tta-ff-mac-scheduler.h (module 'lte'): ns3::TtaFfMacScheduler [class] @@ -1343,12 +1343,12 @@ 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 const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::LtePhyTxEndCallback') + 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::LtePhyTxEndCallback*') + 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::LtePhyTxEndCallback&') typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >', 'ns3::DlHarqRlcPduListBuffer_t') typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >*', 'ns3::DlHarqRlcPduListBuffer_t*') typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >&', 'ns3::DlHarqRlcPduListBuffer_t&') - 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::LtePhyTxEndCallback') - 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::LtePhyTxEndCallback*') - 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::LtePhyTxEndCallback&') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') @@ -1974,7 +1974,6 @@ register_Ns3TdBetFfMacScheduler_methods(root_module, root_module['ns3::TdBetFfMacScheduler']) register_Ns3TdMtFfMacScheduler_methods(root_module, root_module['ns3::TdMtFfMacScheduler']) register_Ns3TdTbfqFfMacScheduler_methods(root_module, root_module['ns3::TdTbfqFfMacScheduler']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TtaFfMacScheduler_methods(root_module, root_module['ns3::TtaFfMacScheduler']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -7271,6 +7270,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -8334,19 +8337,6 @@ 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')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right')) - cls.add_unary_numeric_operator('-') - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], 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')) @@ -8371,6 +8361,19 @@ cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], 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')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right')) + cls.add_unary_numeric_operator('-') + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], 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')) @@ -10854,13 +10857,13 @@ return def register_Ns3SpectrumValue_methods(root_module, cls): - cls.add_unary_numeric_operator('-') - 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')) 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')) 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')) + cls.add_unary_numeric_operator('-') + 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')) 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')) cls.add_output_stream_operator() @@ -10926,8 +10929,8 @@ 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_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')) @@ -11057,6 +11060,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -16815,6 +16828,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -17955,13 +17972,6 @@ [param('uint16_t', 'rnti'), param('uint8_t', 'txMode')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/lte/bindings/modulegen__gcc_LP64.py --- a/src/lte/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/lte/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -618,6 +618,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## ff-mac-common.h (module 'lte'): ns3::PagingInfoListElement_s [struct] module.add_class('PagingInfoListElement_s') ## ff-mac-common.h (module 'lte'): ns3::PhichListElement_s [struct] @@ -1196,8 +1198,6 @@ module.add_class('TdMtFfMacScheduler', parent=root_module['ns3::FfMacScheduler']) ## tdtbfq-ff-mac-scheduler.h (module 'lte'): ns3::TdTbfqFfMacScheduler [class] module.add_class('TdTbfqFfMacScheduler', parent=root_module['ns3::FfMacScheduler']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## tta-ff-mac-scheduler.h (module 'lte'): ns3::TtaFfMacScheduler [class] @@ -1343,12 +1343,12 @@ 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 const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::LtePhyTxEndCallback') + 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::LtePhyTxEndCallback*') + 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::LtePhyTxEndCallback&') typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >', 'ns3::DlHarqRlcPduListBuffer_t') typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >*', 'ns3::DlHarqRlcPduListBuffer_t*') typehandlers.add_type_alias('std::vector< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > >, std::allocator< std::vector< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > >, std::allocator< std::vector< ns3::RlcPduListElement_s, std::allocator< ns3::RlcPduListElement_s > > > > > >&', 'ns3::DlHarqRlcPduListBuffer_t&') - 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::LtePhyTxEndCallback') - 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::LtePhyTxEndCallback*') - 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::LtePhyTxEndCallback&') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') @@ -1974,7 +1974,6 @@ register_Ns3TdBetFfMacScheduler_methods(root_module, root_module['ns3::TdBetFfMacScheduler']) register_Ns3TdMtFfMacScheduler_methods(root_module, root_module['ns3::TdMtFfMacScheduler']) register_Ns3TdTbfqFfMacScheduler_methods(root_module, root_module['ns3::TdTbfqFfMacScheduler']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TtaFfMacScheduler_methods(root_module, root_module['ns3::TtaFfMacScheduler']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -7271,6 +7270,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -8334,19 +8337,6 @@ 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')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right')) - cls.add_unary_numeric_operator('-') - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], 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')) @@ -8371,6 +8361,19 @@ cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], 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')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short unsigned int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned char const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('short int const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('signed char const', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('double const', 'right')) + cls.add_unary_numeric_operator('-') + cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], 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')) @@ -10854,13 +10857,13 @@ return def register_Ns3SpectrumValue_methods(root_module, cls): - cls.add_unary_numeric_operator('-') - 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')) 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')) 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')) + cls.add_unary_numeric_operator('-') + 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')) 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')) cls.add_output_stream_operator() @@ -10926,8 +10929,8 @@ 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_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')) @@ -11057,6 +11060,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -16815,6 +16828,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -17955,13 +17972,6 @@ [param('uint16_t', 'rnti'), param('uint8_t', 'txMode')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/mesh/bindings/modulegen__gcc_ILP32.py --- a/src/mesh/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/mesh/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -126,6 +126,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -368,8 +370,6 @@ module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue']) ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class] module.add_class('SupportedRates', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -676,7 +676,6 @@ register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker']) register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2609,6 +2608,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4474,6 +4477,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -7766,6 +7779,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -8157,13 +8174,6 @@ cls.add_instance_attribute('extended', 'ns3::ExtendedSupportedRatesIE', is_const=False) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/mesh/bindings/modulegen__gcc_LP64.py --- a/src/mesh/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/mesh/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -126,6 +126,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -368,8 +370,6 @@ module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue']) ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class] module.add_class('SupportedRates', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -676,7 +676,6 @@ register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker']) register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2609,6 +2608,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4474,6 +4477,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -7766,6 +7779,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -8157,13 +8174,6 @@ cls.add_instance_attribute('extended', 'ns3::ExtendedSupportedRatesIE', is_const=False) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/mobility/bindings/modulegen__gcc_ILP32.py --- a/src/mobility/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/mobility/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -226,8 +226,6 @@ module.add_class('RectangleValue', parent=root_module['ns3::AttributeValue']) ## steady-state-random-waypoint-mobility-model.h (module 'mobility'): ns3::SteadyStateRandomWaypointMobilityModel [class] module.add_class('SteadyStateRandomWaypointMobilityModel', parent=root_module['ns3::MobilityModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -378,7 +376,6 @@ register_Ns3RectangleChecker_methods(root_module, root_module['ns3::RectangleChecker']) register_Ns3RectangleValue_methods(root_module, root_module['ns3::RectangleValue']) register_Ns3SteadyStateRandomWaypointMobilityModel_methods(root_module, root_module['ns3::SteadyStateRandomWaypointMobilityModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2253,6 +2250,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3879,13 +3886,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/mobility/bindings/modulegen__gcc_LP64.py --- a/src/mobility/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/mobility/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -226,8 +226,6 @@ module.add_class('RectangleValue', parent=root_module['ns3::AttributeValue']) ## steady-state-random-waypoint-mobility-model.h (module 'mobility'): ns3::SteadyStateRandomWaypointMobilityModel [class] module.add_class('SteadyStateRandomWaypointMobilityModel', parent=root_module['ns3::MobilityModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -378,7 +376,6 @@ register_Ns3RectangleChecker_methods(root_module, root_module['ns3::RectangleChecker']) register_Ns3RectangleValue_methods(root_module, root_module['ns3::RectangleValue']) register_Ns3SteadyStateRandomWaypointMobilityModel_methods(root_module, root_module['ns3::SteadyStateRandomWaypointMobilityModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2253,6 +2250,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3879,13 +3886,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/mpi/bindings/modulegen__gcc_ILP32.py --- a/src/mpi/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/mpi/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -68,6 +68,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## mpi-interface.h (module 'mpi'): ns3::SentBuffer [class] module.add_class('SentBuffer') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -158,8 +160,6 @@ module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -243,7 +243,6 @@ register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1068,6 +1067,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2017,6 +2020,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2664,6 +2677,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -2675,13 +2692,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/mpi/bindings/modulegen__gcc_LP64.py --- a/src/mpi/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/mpi/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -68,6 +68,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## mpi-interface.h (module 'mpi'): ns3::SentBuffer [class] module.add_class('SentBuffer') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -158,8 +160,6 @@ module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -243,7 +243,6 @@ register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1068,6 +1067,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2017,6 +2020,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2664,6 +2677,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -2675,13 +2692,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/network/bindings/modulegen__gcc_ILP32.py --- a/src/network/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/network/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -124,6 +124,8 @@ module.add_class('PacketTagList') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData']) ## packetbb.h (module 'network'): ns3::PbbAddressTlvBlock [class] module.add_class('PbbAddressTlvBlock') ## packetbb.h (module 'network'): ns3::PbbTlvBlock [class] @@ -390,8 +392,6 @@ module.add_class('SimpleChannel', parent=root_module['ns3::Channel']) ## simple-net-device.h (module 'network'): ns3::SimpleNetDevice [class] module.add_class('SimpleNetDevice', parent=root_module['ns3::NetDevice']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -408,15 +408,9 @@ module.add_class('PbbAddressTlv', parent=root_module['ns3::PbbTlv']) module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') - 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::SequenceNumber< unsigned short, short >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned short, short >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned short, short >&', 'ns3::SequenceNumber16&') - 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::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') @@ -426,9 +420,15 @@ 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('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('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&') ## Register a nested module for the namespace FatalImpl @@ -613,7 +613,6 @@ register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -624,8 +623,8 @@ return def register_Ns3Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## address.h (module 'network'): ns3::Address::Address() [constructor] @@ -1495,8 +1494,8 @@ return def register_Ns3Ipv4Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] @@ -1666,8 +1665,8 @@ return def register_Ns3Ipv6Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor] @@ -1897,8 +1896,8 @@ return def register_Ns3Mac48Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] @@ -2499,6 +2498,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3133,8 +3136,8 @@ return def register_Ns3TypeId_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor] @@ -3314,6 +3317,8 @@ return 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')) @@ -3365,9 +3370,7 @@ cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right')) cls.add_binary_comparison_operator('<') 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() @@ -4987,12 +4990,12 @@ return 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_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('<=') @@ -5120,6 +5123,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6965,6 +6978,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -8415,13 +8432,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/network/bindings/modulegen__gcc_LP64.py --- a/src/network/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/network/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -124,6 +124,8 @@ module.add_class('PacketTagList') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData']) ## packetbb.h (module 'network'): ns3::PbbAddressTlvBlock [class] module.add_class('PbbAddressTlvBlock') ## packetbb.h (module 'network'): ns3::PbbTlvBlock [class] @@ -390,8 +392,6 @@ module.add_class('SimpleChannel', parent=root_module['ns3::Channel']) ## simple-net-device.h (module 'network'): ns3::SimpleNetDevice [class] module.add_class('SimpleNetDevice', parent=root_module['ns3::NetDevice']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -408,15 +408,9 @@ module.add_class('PbbAddressTlv', parent=root_module['ns3::PbbTlv']) module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') - 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::SequenceNumber< unsigned short, short >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned short, short >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned short, short >&', 'ns3::SequenceNumber16&') - 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::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') @@ -426,9 +420,15 @@ 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('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('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&') ## Register a nested module for the namespace FatalImpl @@ -613,7 +613,6 @@ register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -624,8 +623,8 @@ return def register_Ns3Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## address.h (module 'network'): ns3::Address::Address() [constructor] @@ -1495,8 +1494,8 @@ return def register_Ns3Ipv4Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] @@ -1666,8 +1665,8 @@ return def register_Ns3Ipv6Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor] @@ -1897,8 +1896,8 @@ return def register_Ns3Mac48Address_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] @@ -2499,6 +2498,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3133,8 +3136,8 @@ return def register_Ns3TypeId_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('!=') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor] @@ -3314,6 +3317,8 @@ return 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')) @@ -3365,9 +3370,7 @@ cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right')) cls.add_binary_comparison_operator('<') 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() @@ -4987,12 +4990,12 @@ return 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_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('<=') @@ -5120,6 +5123,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6965,6 +6978,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -8415,13 +8432,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py --- a/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -138,6 +138,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -304,8 +306,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -454,7 +454,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2170,6 +2169,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4033,6 +4036,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5528,6 +5541,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5539,13 +5556,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/nix-vector-routing/bindings/modulegen__gcc_LP64.py --- a/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -138,6 +138,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -304,8 +306,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -454,7 +454,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2170,6 +2169,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4033,6 +4036,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5528,6 +5541,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5539,13 +5556,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/olsr/bindings/modulegen__gcc_ILP32.py --- a/src/olsr/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/olsr/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -332,8 +332,6 @@ module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -584,7 +582,6 @@ register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -4398,6 +4395,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6493,13 +6500,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/olsr/bindings/modulegen__gcc_LP64.py --- a/src/olsr/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/olsr/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -332,8 +332,6 @@ module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -584,7 +582,6 @@ register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -4398,6 +4395,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6493,13 +6500,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py --- a/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -146,6 +146,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -338,8 +340,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -492,7 +492,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2474,6 +2473,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4905,6 +4908,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6881,6 +6894,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -6892,13 +6909,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/point-to-point-layout/bindings/modulegen__gcc_LP64.py --- a/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -146,6 +146,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -338,8 +340,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -492,7 +492,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2474,6 +2473,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4905,6 +4908,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6881,6 +6894,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -6892,13 +6909,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/point-to-point/bindings/modulegen__gcc_ILP32.py --- a/src/point-to-point/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/point-to-point/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -94,6 +94,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -274,8 +276,6 @@ module.add_enum('ErrorUnit', ['ERROR_UNIT_BIT', 'ERROR_UNIT_BYTE', 'ERROR_UNIT_PACKET'], outer_class=root_module['ns3::RateErrorModel'], import_from_module='ns.network') ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class] module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -416,7 +416,6 @@ register_Ns3PointToPointRemoteChannel_methods(root_module, root_module['ns3::PointToPointRemoteChannel']) register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1957,6 +1956,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3296,6 +3299,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4868,6 +4881,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5258,13 +5275,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/point-to-point/bindings/modulegen__gcc_LP64.py --- a/src/point-to-point/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/point-to-point/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -94,6 +94,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -274,8 +276,6 @@ module.add_enum('ErrorUnit', ['ERROR_UNIT_BIT', 'ERROR_UNIT_BYTE', 'ERROR_UNIT_PACKET'], outer_class=root_module['ns3::RateErrorModel'], import_from_module='ns.network') ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class] module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -416,7 +416,6 @@ register_Ns3PointToPointRemoteChannel_methods(root_module, root_module['ns3::PointToPointRemoteChannel']) register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1957,6 +1956,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3296,6 +3299,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4868,6 +4881,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5258,13 +5275,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/propagation/bindings/modulegen__gcc_ILP32.py --- a/src/propagation/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/propagation/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -166,8 +166,6 @@ module.add_class('OkumuraHataPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -273,7 +271,6 @@ register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable']) register_Ns3OkumuraHataPropagationLossModel_methods(root_module, root_module['ns3::OkumuraHataPropagationLossModel']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1248,6 +1245,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2525,13 +2532,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/propagation/bindings/modulegen__gcc_LP64.py --- a/src/propagation/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/propagation/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -166,8 +166,6 @@ module.add_class('OkumuraHataPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## random-variable-stream.h (module 'core'): ns3::ParetoRandomVariable [class] module.add_class('ParetoRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -273,7 +271,6 @@ register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable']) register_Ns3OkumuraHataPropagationLossModel_methods(root_module, root_module['ns3::OkumuraHataPropagationLossModel']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1248,6 +1245,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2525,13 +2532,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/spectrum/bindings/modulegen__gcc_ILP32.py --- a/src/spectrum/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/spectrum/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -96,6 +96,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::RxSpectrumModelInfo [class] module.add_class('RxSpectrumModelInfo') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -336,8 +338,6 @@ module.add_class('SpectrumAnalyzer', parent=root_module['ns3::SpectrumPhy']) ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel [class] module.add_class('SpectrumChannel', parent=root_module['ns3::Channel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -583,7 +583,6 @@ register_Ns3ShannonSpectrumErrorModel_methods(root_module, root_module['ns3::ShannonSpectrumErrorModel']) register_Ns3SpectrumAnalyzer_methods(root_module, root_module['ns3::SpectrumAnalyzer']) register_Ns3SpectrumChannel_methods(root_module, root_module['ns3::SpectrumChannel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2091,6 +2090,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3782,6 +3785,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3915,14 +3928,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -3936,8 +3945,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -4772,14 +4781,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -4793,8 +4798,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -6033,6 +6038,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -6229,13 +6238,6 @@ is_pure_virtual=True, is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/spectrum/bindings/modulegen__gcc_LP64.py --- a/src/spectrum/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/spectrum/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -96,6 +96,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::RxSpectrumModelInfo [class] module.add_class('RxSpectrumModelInfo') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -336,8 +338,6 @@ module.add_class('SpectrumAnalyzer', parent=root_module['ns3::SpectrumPhy']) ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel [class] module.add_class('SpectrumChannel', parent=root_module['ns3::Channel']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -583,7 +583,6 @@ register_Ns3ShannonSpectrumErrorModel_methods(root_module, root_module['ns3::ShannonSpectrumErrorModel']) register_Ns3SpectrumAnalyzer_methods(root_module, root_module['ns3::SpectrumAnalyzer']) register_Ns3SpectrumChannel_methods(root_module, root_module['ns3::SpectrumChannel']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2091,6 +2090,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3782,6 +3785,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3915,14 +3928,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -3936,8 +3945,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -4772,14 +4781,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -4793,8 +4798,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -6033,6 +6038,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -6229,13 +6238,6 @@ is_pure_virtual=True, is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/stats/bindings/modulegen__gcc_ILP32.py --- a/src/stats/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/stats/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -46,8 +46,16 @@ module.add_class('CallbackBase', import_from_module='ns.core') ## data-output-interface.h (module 'stats'): ns3::DataOutputCallback [class] module.add_class('DataOutputCallback', allow_subclassing=True) + ## delay-jitter-estimation.h (module 'stats'): ns3::DelayJitterEstimation [class] + module.add_class('DelayJitterEstimation') ## event-id.h (module 'core'): ns3::EventId [class] module.add_class('EventId', import_from_module='ns.core') + ## gnuplot.h (module 'stats'): ns3::Gnuplot [class] + module.add_class('Gnuplot') + ## gnuplot.h (module 'stats'): ns3::GnuplotCollection [class] + module.add_class('GnuplotCollection') + ## gnuplot.h (module 'stats'): ns3::GnuplotDataset [class] + module.add_class('GnuplotDataset') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] module.add_class('Ipv4Address', import_from_module='ns.network') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] @@ -86,6 +94,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -110,6 +120,18 @@ module.add_class('int64x64_t', import_from_module='ns.core') ## chunk.h (module 'network'): ns3::Chunk [class] module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset [class] + module.add_class('Gnuplot2dDataset', parent=root_module['ns3::GnuplotDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::Style [enumeration] + module.add_enum('Style', ['LINES', 'POINTS', 'LINES_POINTS', 'DOTS', 'IMPULSES', 'STEPS', 'FSTEPS', 'HISTEPS'], outer_class=root_module['ns3::Gnuplot2dDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::ErrorBars [enumeration] + module.add_enum('ErrorBars', ['NONE', 'X', 'Y', 'XY'], outer_class=root_module['ns3::Gnuplot2dDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dFunction [class] + module.add_class('Gnuplot2dFunction', parent=root_module['ns3::GnuplotDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dDataset [class] + module.add_class('Gnuplot3dDataset', parent=root_module['ns3::GnuplotDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dFunction [class] + module.add_class('Gnuplot3dFunction', parent=root_module['ns3::GnuplotDataset']) ## header.h (module 'network'): ns3::Header [class] module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## object.h (module 'core'): ns3::Object [class] @@ -184,6 +206,8 @@ module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator [class] + module.add_class('MinMaxAvgTotalCalculator', template_parameters=['double'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']]) ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator [class] module.add_class('MinMaxAvgTotalCalculator', template_parameters=['unsigned int'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']]) ## nix-vector.h (module 'network'): ns3::NixVector [class] @@ -200,8 +224,6 @@ module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) ## sqlite-data-output.h (module 'stats'): ns3::SqliteDataOutput [class] module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## time-data-calculators.h (module 'stats'): ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -218,12 +240,12 @@ module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator']) ## packet-data-calculators.h (module 'stats'): ns3::PacketCounterCalculator [class] module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >']) + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') ## Register a nested module for the namespace FatalImpl @@ -248,7 +270,11 @@ register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item']) register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback']) + register_Ns3DelayJitterEstimation_methods(root_module, root_module['ns3::DelayJitterEstimation']) register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) + register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) + register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) + register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address']) register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) @@ -275,6 +301,10 @@ register_Ns3Empty_methods(root_module, root_module['ns3::empty']) register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t']) register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk']) + register_Ns3Gnuplot2dDataset_methods(root_module, root_module['ns3::Gnuplot2dDataset']) + register_Ns3Gnuplot2dFunction_methods(root_module, root_module['ns3::Gnuplot2dFunction']) + register_Ns3Gnuplot3dDataset_methods(root_module, root_module['ns3::Gnuplot3dDataset']) + register_Ns3Gnuplot3dFunction_methods(root_module, root_module['ns3::Gnuplot3dFunction']) register_Ns3Header_methods(root_module, root_module['ns3::Header']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) @@ -310,6 +340,7 @@ register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) + register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< double >']) register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) @@ -318,7 +349,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -844,6 +874,32 @@ is_pure_virtual=True, is_virtual=True) return +def register_Ns3DelayJitterEstimation_methods(root_module, cls): + ## delay-jitter-estimation.h (module 'stats'): ns3::DelayJitterEstimation::DelayJitterEstimation(ns3::DelayJitterEstimation const & arg0) [copy constructor] + cls.add_constructor([param('ns3::DelayJitterEstimation const &', 'arg0')]) + ## delay-jitter-estimation.h (module 'stats'): ns3::DelayJitterEstimation::DelayJitterEstimation() [constructor] + cls.add_constructor([]) + ## delay-jitter-estimation.h (module 'stats'): ns3::Time ns3::DelayJitterEstimation::GetLastDelay() const [member function] + cls.add_method('GetLastDelay', + 'ns3::Time', + [], + is_const=True) + ## delay-jitter-estimation.h (module 'stats'): uint64_t ns3::DelayJitterEstimation::GetLastJitter() const [member function] + cls.add_method('GetLastJitter', + 'uint64_t', + [], + is_const=True) + ## delay-jitter-estimation.h (module 'stats'): static void ns3::DelayJitterEstimation::PrepareTx(ns3::Ptr packet) [member function] + cls.add_method('PrepareTx', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')], + is_static=True) + ## delay-jitter-estimation.h (module 'stats'): void ns3::DelayJitterEstimation::RecordRx(ns3::Ptr packet) [member function] + cls.add_method('RecordRx', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + return + def register_Ns3EventId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('==') @@ -889,6 +945,92 @@ is_const=True) return +def register_Ns3Gnuplot_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot::Gnuplot(ns3::Gnuplot const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot::Gnuplot(std::string const & outputFilename="", std::string const & title="") [constructor] + cls.add_constructor([param('std::string const &', 'outputFilename', default_value='""'), param('std::string const &', 'title', default_value='""')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::AddDataset(ns3::GnuplotDataset const & dataset) [member function] + cls.add_method('AddDataset', + 'void', + [param('ns3::GnuplotDataset const &', 'dataset')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::AppendExtra(std::string const & extra) [member function] + cls.add_method('AppendExtra', + 'void', + [param('std::string const &', 'extra')]) + ## gnuplot.h (module 'stats'): static std::string ns3::Gnuplot::DetectTerminal(std::string const & filename) [member function] + cls.add_method('DetectTerminal', + 'std::string', + [param('std::string const &', 'filename')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::GenerateOutput(std::ostream & os) const [member function] + cls.add_method('GenerateOutput', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetExtra(std::string const & extra) [member function] + cls.add_method('SetExtra', + 'void', + [param('std::string const &', 'extra')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetLegend(std::string const & xLegend, std::string const & yLegend) [member function] + cls.add_method('SetLegend', + 'void', + [param('std::string const &', 'xLegend'), param('std::string const &', 'yLegend')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetTerminal(std::string const & terminal) [member function] + cls.add_method('SetTerminal', + 'void', + [param('std::string const &', 'terminal')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetTitle(std::string const & title) [member function] + cls.add_method('SetTitle', + 'void', + [param('std::string const &', 'title')]) + return + +def register_Ns3GnuplotCollection_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::GnuplotCollection::GnuplotCollection(ns3::GnuplotCollection const & arg0) [copy constructor] + cls.add_constructor([param('ns3::GnuplotCollection const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::GnuplotCollection::GnuplotCollection(std::string const & outputFilename) [constructor] + cls.add_constructor([param('std::string const &', 'outputFilename')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotCollection::AddPlot(ns3::Gnuplot const & plot) [member function] + cls.add_method('AddPlot', + 'void', + [param('ns3::Gnuplot const &', 'plot')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotCollection::GenerateOutput(std::ostream & os) const [member function] + cls.add_method('GenerateOutput', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## gnuplot.h (module 'stats'): ns3::Gnuplot & ns3::GnuplotCollection::GetPlot(unsigned int id) [member function] + cls.add_method('GetPlot', + 'ns3::Gnuplot &', + [param('unsigned int', 'id')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotCollection::SetTerminal(std::string const & terminal) [member function] + cls.add_method('SetTerminal', + 'void', + [param('std::string const &', 'terminal')]) + return + +def register_Ns3GnuplotDataset_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::GnuplotDataset::GnuplotDataset(ns3::GnuplotDataset const & original) [copy constructor] + cls.add_constructor([param('ns3::GnuplotDataset const &', 'original')]) + ## gnuplot.h (module 'stats'): static void ns3::GnuplotDataset::SetDefaultExtra(std::string const & extra) [member function] + cls.add_method('SetDefaultExtra', + 'void', + [param('std::string const &', 'extra')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::GnuplotDataset::SetExtra(std::string const & extra) [member function] + cls.add_method('SetExtra', + 'void', + [param('std::string const &', 'extra')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotDataset::SetTitle(std::string const & title) [member function] + cls.add_method('SetTitle', + 'void', + [param('std::string const &', 'title')]) + ## gnuplot.h (module 'stats'): ns3::GnuplotDataset::GnuplotDataset(ns3::GnuplotDataset::Data * data) [constructor] + cls.add_constructor([param('ns3::GnuplotDataset::Data *', 'data')], + visibility='protected') + return + def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') @@ -1642,6 +1784,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2203,6 +2349,93 @@ is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3Gnuplot2dDataset_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::Gnuplot2dDataset(ns3::Gnuplot2dDataset const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot2dDataset const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::Gnuplot2dDataset(std::string const & title="Untitled") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::Add(double x, double y) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::Add(double x, double y, double errorDelta) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y'), param('double', 'errorDelta')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::Add(double x, double y, double xErrorDelta, double yErrorDelta) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y'), param('double', 'xErrorDelta'), param('double', 'yErrorDelta')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::AddEmptyLine() [member function] + cls.add_method('AddEmptyLine', + 'void', + []) + ## gnuplot.h (module 'stats'): static void ns3::Gnuplot2dDataset::SetDefaultErrorBars(ns3::Gnuplot2dDataset::ErrorBars errorBars) [member function] + cls.add_method('SetDefaultErrorBars', + 'void', + [param('ns3::Gnuplot2dDataset::ErrorBars', 'errorBars')], + is_static=True) + ## gnuplot.h (module 'stats'): static void ns3::Gnuplot2dDataset::SetDefaultStyle(ns3::Gnuplot2dDataset::Style style) [member function] + cls.add_method('SetDefaultStyle', + 'void', + [param('ns3::Gnuplot2dDataset::Style', 'style')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::SetErrorBars(ns3::Gnuplot2dDataset::ErrorBars errorBars) [member function] + cls.add_method('SetErrorBars', + 'void', + [param('ns3::Gnuplot2dDataset::ErrorBars', 'errorBars')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::SetStyle(ns3::Gnuplot2dDataset::Style style) [member function] + cls.add_method('SetStyle', + 'void', + [param('ns3::Gnuplot2dDataset::Style', 'style')]) + return + +def register_Ns3Gnuplot2dFunction_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dFunction::Gnuplot2dFunction(ns3::Gnuplot2dFunction const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot2dFunction const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dFunction::Gnuplot2dFunction(std::string const & title="Untitled", std::string const & function="") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"'), param('std::string const &', 'function', default_value='""')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dFunction::SetFunction(std::string const & function) [member function] + cls.add_method('SetFunction', + 'void', + [param('std::string const &', 'function')]) + return + +def register_Ns3Gnuplot3dDataset_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dDataset::Gnuplot3dDataset(ns3::Gnuplot3dDataset const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot3dDataset const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dDataset::Gnuplot3dDataset(std::string const & title="Untitled") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dDataset::Add(double x, double y, double z) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y'), param('double', 'z')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dDataset::AddEmptyLine() [member function] + cls.add_method('AddEmptyLine', + 'void', + []) + ## gnuplot.h (module 'stats'): static void ns3::Gnuplot3dDataset::SetDefaultStyle(std::string const & style) [member function] + cls.add_method('SetDefaultStyle', + 'void', + [param('std::string const &', 'style')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dDataset::SetStyle(std::string const & style) [member function] + cls.add_method('SetStyle', + 'void', + [param('std::string const &', 'style')]) + return + +def register_Ns3Gnuplot3dFunction_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dFunction::Gnuplot3dFunction(ns3::Gnuplot3dFunction const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot3dFunction const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dFunction::Gnuplot3dFunction(std::string const & title="Untitled", std::string const & function="") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"'), param('std::string const &', 'function', default_value='""')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dFunction::SetFunction(std::string const & function) [member function] + cls.add_method('SetFunction', + 'void', + [param('std::string const &', 'function')]) + return + def register_Ns3Header_methods(root_module, cls): cls.add_output_stream_operator() ## header.h (module 'network'): ns3::Header::Header() [constructor] @@ -2532,6 +2765,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3155,6 +3398,71 @@ [param('ns3::Mac48Address const &', 'value')]) return +def register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, cls): + ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< double > const &', 'arg0')]) + ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator::MinMaxAvgTotalCalculator() [constructor] + cls.add_constructor([]) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::Output(ns3::DataOutputCallback & callback) const [member function] + cls.add_method('Output', + 'void', + [param('ns3::DataOutputCallback &', 'callback')], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::Reset() [member function] + cls.add_method('Reset', + 'void', + []) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::Update(double const i) [member function] + cls.add_method('Update', + 'void', + [param('double const', 'i')]) + ## basic-data-calculators.h (module 'stats'): long int ns3::MinMaxAvgTotalCalculator::getCount() const [member function] + cls.add_method('getCount', + 'long int', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getMax() const [member function] + cls.add_method('getMax', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getMean() const [member function] + cls.add_method('getMean', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getMin() const [member function] + cls.add_method('getMin', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getSqrSum() const [member function] + cls.add_method('getSqrSum', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getStddev() const [member function] + cls.add_method('getStddev', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getSum() const [member function] + cls.add_method('getSum', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getVariance() const [member function] + cls.add_method('getVariance', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + return + def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls): ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')]) @@ -3491,6 +3799,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -3539,13 +3851,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h (module 'stats'): ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff -r 0799c5d3505f -r 9a100979b2df src/stats/bindings/modulegen__gcc_LP64.py --- a/src/stats/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/stats/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -46,8 +46,16 @@ module.add_class('CallbackBase', import_from_module='ns.core') ## data-output-interface.h (module 'stats'): ns3::DataOutputCallback [class] module.add_class('DataOutputCallback', allow_subclassing=True) + ## delay-jitter-estimation.h (module 'stats'): ns3::DelayJitterEstimation [class] + module.add_class('DelayJitterEstimation') ## event-id.h (module 'core'): ns3::EventId [class] module.add_class('EventId', import_from_module='ns.core') + ## gnuplot.h (module 'stats'): ns3::Gnuplot [class] + module.add_class('Gnuplot') + ## gnuplot.h (module 'stats'): ns3::GnuplotCollection [class] + module.add_class('GnuplotCollection') + ## gnuplot.h (module 'stats'): ns3::GnuplotDataset [class] + module.add_class('GnuplotDataset') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] module.add_class('Ipv4Address', import_from_module='ns.network') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] @@ -86,6 +94,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -110,6 +120,18 @@ module.add_class('int64x64_t', import_from_module='ns.core') ## chunk.h (module 'network'): ns3::Chunk [class] module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset [class] + module.add_class('Gnuplot2dDataset', parent=root_module['ns3::GnuplotDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::Style [enumeration] + module.add_enum('Style', ['LINES', 'POINTS', 'LINES_POINTS', 'DOTS', 'IMPULSES', 'STEPS', 'FSTEPS', 'HISTEPS'], outer_class=root_module['ns3::Gnuplot2dDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::ErrorBars [enumeration] + module.add_enum('ErrorBars', ['NONE', 'X', 'Y', 'XY'], outer_class=root_module['ns3::Gnuplot2dDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dFunction [class] + module.add_class('Gnuplot2dFunction', parent=root_module['ns3::GnuplotDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dDataset [class] + module.add_class('Gnuplot3dDataset', parent=root_module['ns3::GnuplotDataset']) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dFunction [class] + module.add_class('Gnuplot3dFunction', parent=root_module['ns3::GnuplotDataset']) ## header.h (module 'network'): ns3::Header [class] module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## object.h (module 'core'): ns3::Object [class] @@ -184,6 +206,8 @@ module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator [class] + module.add_class('MinMaxAvgTotalCalculator', template_parameters=['double'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']]) ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator [class] module.add_class('MinMaxAvgTotalCalculator', template_parameters=['unsigned int'], parent=[root_module['ns3::DataCalculator'], root_module['ns3::StatisticalSummary']]) ## nix-vector.h (module 'network'): ns3::NixVector [class] @@ -200,8 +224,6 @@ module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) ## sqlite-data-output.h (module 'stats'): ns3::SqliteDataOutput [class] module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## time-data-calculators.h (module 'stats'): ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -218,12 +240,12 @@ module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator']) ## packet-data-calculators.h (module 'stats'): ns3::PacketCounterCalculator [class] module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >']) + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') ## Register a nested module for the namespace FatalImpl @@ -248,7 +270,11 @@ register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item']) register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback']) + register_Ns3DelayJitterEstimation_methods(root_module, root_module['ns3::DelayJitterEstimation']) register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) + register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) + register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) + register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address']) register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) @@ -275,6 +301,10 @@ register_Ns3Empty_methods(root_module, root_module['ns3::empty']) register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t']) register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk']) + register_Ns3Gnuplot2dDataset_methods(root_module, root_module['ns3::Gnuplot2dDataset']) + register_Ns3Gnuplot2dFunction_methods(root_module, root_module['ns3::Gnuplot2dFunction']) + register_Ns3Gnuplot3dDataset_methods(root_module, root_module['ns3::Gnuplot3dDataset']) + register_Ns3Gnuplot3dFunction_methods(root_module, root_module['ns3::Gnuplot3dFunction']) register_Ns3Header_methods(root_module, root_module['ns3::Header']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) @@ -310,6 +340,7 @@ register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) + register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< double >']) register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) @@ -318,7 +349,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -844,6 +874,32 @@ is_pure_virtual=True, is_virtual=True) return +def register_Ns3DelayJitterEstimation_methods(root_module, cls): + ## delay-jitter-estimation.h (module 'stats'): ns3::DelayJitterEstimation::DelayJitterEstimation(ns3::DelayJitterEstimation const & arg0) [copy constructor] + cls.add_constructor([param('ns3::DelayJitterEstimation const &', 'arg0')]) + ## delay-jitter-estimation.h (module 'stats'): ns3::DelayJitterEstimation::DelayJitterEstimation() [constructor] + cls.add_constructor([]) + ## delay-jitter-estimation.h (module 'stats'): ns3::Time ns3::DelayJitterEstimation::GetLastDelay() const [member function] + cls.add_method('GetLastDelay', + 'ns3::Time', + [], + is_const=True) + ## delay-jitter-estimation.h (module 'stats'): uint64_t ns3::DelayJitterEstimation::GetLastJitter() const [member function] + cls.add_method('GetLastJitter', + 'uint64_t', + [], + is_const=True) + ## delay-jitter-estimation.h (module 'stats'): static void ns3::DelayJitterEstimation::PrepareTx(ns3::Ptr packet) [member function] + cls.add_method('PrepareTx', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')], + is_static=True) + ## delay-jitter-estimation.h (module 'stats'): void ns3::DelayJitterEstimation::RecordRx(ns3::Ptr packet) [member function] + cls.add_method('RecordRx', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + return + def register_Ns3EventId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('==') @@ -889,6 +945,92 @@ is_const=True) return +def register_Ns3Gnuplot_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot::Gnuplot(ns3::Gnuplot const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot::Gnuplot(std::string const & outputFilename="", std::string const & title="") [constructor] + cls.add_constructor([param('std::string const &', 'outputFilename', default_value='""'), param('std::string const &', 'title', default_value='""')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::AddDataset(ns3::GnuplotDataset const & dataset) [member function] + cls.add_method('AddDataset', + 'void', + [param('ns3::GnuplotDataset const &', 'dataset')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::AppendExtra(std::string const & extra) [member function] + cls.add_method('AppendExtra', + 'void', + [param('std::string const &', 'extra')]) + ## gnuplot.h (module 'stats'): static std::string ns3::Gnuplot::DetectTerminal(std::string const & filename) [member function] + cls.add_method('DetectTerminal', + 'std::string', + [param('std::string const &', 'filename')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::GenerateOutput(std::ostream & os) const [member function] + cls.add_method('GenerateOutput', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetExtra(std::string const & extra) [member function] + cls.add_method('SetExtra', + 'void', + [param('std::string const &', 'extra')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetLegend(std::string const & xLegend, std::string const & yLegend) [member function] + cls.add_method('SetLegend', + 'void', + [param('std::string const &', 'xLegend'), param('std::string const &', 'yLegend')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetTerminal(std::string const & terminal) [member function] + cls.add_method('SetTerminal', + 'void', + [param('std::string const &', 'terminal')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot::SetTitle(std::string const & title) [member function] + cls.add_method('SetTitle', + 'void', + [param('std::string const &', 'title')]) + return + +def register_Ns3GnuplotCollection_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::GnuplotCollection::GnuplotCollection(ns3::GnuplotCollection const & arg0) [copy constructor] + cls.add_constructor([param('ns3::GnuplotCollection const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::GnuplotCollection::GnuplotCollection(std::string const & outputFilename) [constructor] + cls.add_constructor([param('std::string const &', 'outputFilename')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotCollection::AddPlot(ns3::Gnuplot const & plot) [member function] + cls.add_method('AddPlot', + 'void', + [param('ns3::Gnuplot const &', 'plot')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotCollection::GenerateOutput(std::ostream & os) const [member function] + cls.add_method('GenerateOutput', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## gnuplot.h (module 'stats'): ns3::Gnuplot & ns3::GnuplotCollection::GetPlot(unsigned int id) [member function] + cls.add_method('GetPlot', + 'ns3::Gnuplot &', + [param('unsigned int', 'id')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotCollection::SetTerminal(std::string const & terminal) [member function] + cls.add_method('SetTerminal', + 'void', + [param('std::string const &', 'terminal')]) + return + +def register_Ns3GnuplotDataset_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::GnuplotDataset::GnuplotDataset(ns3::GnuplotDataset const & original) [copy constructor] + cls.add_constructor([param('ns3::GnuplotDataset const &', 'original')]) + ## gnuplot.h (module 'stats'): static void ns3::GnuplotDataset::SetDefaultExtra(std::string const & extra) [member function] + cls.add_method('SetDefaultExtra', + 'void', + [param('std::string const &', 'extra')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::GnuplotDataset::SetExtra(std::string const & extra) [member function] + cls.add_method('SetExtra', + 'void', + [param('std::string const &', 'extra')]) + ## gnuplot.h (module 'stats'): void ns3::GnuplotDataset::SetTitle(std::string const & title) [member function] + cls.add_method('SetTitle', + 'void', + [param('std::string const &', 'title')]) + ## gnuplot.h (module 'stats'): ns3::GnuplotDataset::GnuplotDataset(ns3::GnuplotDataset::Data * data) [constructor] + cls.add_constructor([param('ns3::GnuplotDataset::Data *', 'data')], + visibility='protected') + return + def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') @@ -1642,6 +1784,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2203,6 +2349,93 @@ is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3Gnuplot2dDataset_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::Gnuplot2dDataset(ns3::Gnuplot2dDataset const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot2dDataset const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dDataset::Gnuplot2dDataset(std::string const & title="Untitled") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::Add(double x, double y) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::Add(double x, double y, double errorDelta) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y'), param('double', 'errorDelta')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::Add(double x, double y, double xErrorDelta, double yErrorDelta) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y'), param('double', 'xErrorDelta'), param('double', 'yErrorDelta')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::AddEmptyLine() [member function] + cls.add_method('AddEmptyLine', + 'void', + []) + ## gnuplot.h (module 'stats'): static void ns3::Gnuplot2dDataset::SetDefaultErrorBars(ns3::Gnuplot2dDataset::ErrorBars errorBars) [member function] + cls.add_method('SetDefaultErrorBars', + 'void', + [param('ns3::Gnuplot2dDataset::ErrorBars', 'errorBars')], + is_static=True) + ## gnuplot.h (module 'stats'): static void ns3::Gnuplot2dDataset::SetDefaultStyle(ns3::Gnuplot2dDataset::Style style) [member function] + cls.add_method('SetDefaultStyle', + 'void', + [param('ns3::Gnuplot2dDataset::Style', 'style')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::SetErrorBars(ns3::Gnuplot2dDataset::ErrorBars errorBars) [member function] + cls.add_method('SetErrorBars', + 'void', + [param('ns3::Gnuplot2dDataset::ErrorBars', 'errorBars')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dDataset::SetStyle(ns3::Gnuplot2dDataset::Style style) [member function] + cls.add_method('SetStyle', + 'void', + [param('ns3::Gnuplot2dDataset::Style', 'style')]) + return + +def register_Ns3Gnuplot2dFunction_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dFunction::Gnuplot2dFunction(ns3::Gnuplot2dFunction const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot2dFunction const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot2dFunction::Gnuplot2dFunction(std::string const & title="Untitled", std::string const & function="") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"'), param('std::string const &', 'function', default_value='""')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot2dFunction::SetFunction(std::string const & function) [member function] + cls.add_method('SetFunction', + 'void', + [param('std::string const &', 'function')]) + return + +def register_Ns3Gnuplot3dDataset_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dDataset::Gnuplot3dDataset(ns3::Gnuplot3dDataset const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot3dDataset const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dDataset::Gnuplot3dDataset(std::string const & title="Untitled") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dDataset::Add(double x, double y, double z) [member function] + cls.add_method('Add', + 'void', + [param('double', 'x'), param('double', 'y'), param('double', 'z')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dDataset::AddEmptyLine() [member function] + cls.add_method('AddEmptyLine', + 'void', + []) + ## gnuplot.h (module 'stats'): static void ns3::Gnuplot3dDataset::SetDefaultStyle(std::string const & style) [member function] + cls.add_method('SetDefaultStyle', + 'void', + [param('std::string const &', 'style')], + is_static=True) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dDataset::SetStyle(std::string const & style) [member function] + cls.add_method('SetStyle', + 'void', + [param('std::string const &', 'style')]) + return + +def register_Ns3Gnuplot3dFunction_methods(root_module, cls): + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dFunction::Gnuplot3dFunction(ns3::Gnuplot3dFunction const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Gnuplot3dFunction const &', 'arg0')]) + ## gnuplot.h (module 'stats'): ns3::Gnuplot3dFunction::Gnuplot3dFunction(std::string const & title="Untitled", std::string const & function="") [constructor] + cls.add_constructor([param('std::string const &', 'title', default_value='"Untitled"'), param('std::string const &', 'function', default_value='""')]) + ## gnuplot.h (module 'stats'): void ns3::Gnuplot3dFunction::SetFunction(std::string const & function) [member function] + cls.add_method('SetFunction', + 'void', + [param('std::string const &', 'function')]) + return + def register_Ns3Header_methods(root_module, cls): cls.add_output_stream_operator() ## header.h (module 'network'): ns3::Header::Header() [constructor] @@ -2532,6 +2765,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3155,6 +3398,71 @@ [param('ns3::Mac48Address const &', 'value')]) return +def register_Ns3MinMaxAvgTotalCalculator__Double_methods(root_module, cls): + ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< double > const &', 'arg0')]) + ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator::MinMaxAvgTotalCalculator() [constructor] + cls.add_constructor([]) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::Output(ns3::DataOutputCallback & callback) const [member function] + cls.add_method('Output', + 'void', + [param('ns3::DataOutputCallback &', 'callback')], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::Reset() [member function] + cls.add_method('Reset', + 'void', + []) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::Update(double const i) [member function] + cls.add_method('Update', + 'void', + [param('double const', 'i')]) + ## basic-data-calculators.h (module 'stats'): long int ns3::MinMaxAvgTotalCalculator::getCount() const [member function] + cls.add_method('getCount', + 'long int', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getMax() const [member function] + cls.add_method('getMax', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getMean() const [member function] + cls.add_method('getMean', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getMin() const [member function] + cls.add_method('getMin', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getSqrSum() const [member function] + cls.add_method('getSqrSum', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getStddev() const [member function] + cls.add_method('getStddev', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getSum() const [member function] + cls.add_method('getSum', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): double ns3::MinMaxAvgTotalCalculator::getVariance() const [member function] + cls.add_method('getVariance', + 'double', + [], + is_const=True, is_virtual=True) + ## basic-data-calculators.h (module 'stats'): void ns3::MinMaxAvgTotalCalculator::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + return + def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls): ## basic-data-calculators.h (module 'stats'): ns3::MinMaxAvgTotalCalculator::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')]) @@ -3491,6 +3799,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -3539,13 +3851,6 @@ visibility='protected', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h (module 'stats'): ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff -r 0799c5d3505f -r 9a100979b2df src/tap-bridge/bindings/modulegen__gcc_ILP32.py --- a/src/tap-bridge/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/tap-bridge/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -88,6 +88,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## tag.h (module 'network'): ns3::Tag [class] @@ -210,8 +212,6 @@ module.add_enum('Mode', ['ILLEGAL', 'CONFIGURE_LOCAL', 'USE_LOCAL', 'USE_BRIDGE'], outer_class=root_module['ns3::TapBridge']) ## tap-bridge.h (module 'tap-bridge'): ns3::TapBridgeFdReader [class] module.add_class('TapBridgeFdReader', parent=root_module['ns3::FdReader']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -319,7 +319,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3TapBridge_methods(root_module, root_module['ns3::TapBridge']) register_Ns3TapBridgeFdReader_methods(root_module, root_module['ns3::TapBridgeFdReader']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1676,6 +1675,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2521,6 +2524,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3516,6 +3529,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -3710,13 +3727,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/tap-bridge/bindings/modulegen__gcc_LP64.py --- a/src/tap-bridge/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/tap-bridge/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -88,6 +88,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## 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')) ## tag.h (module 'network'): ns3::Tag [class] @@ -210,8 +212,6 @@ module.add_enum('Mode', ['ILLEGAL', 'CONFIGURE_LOCAL', 'USE_LOCAL', 'USE_BRIDGE'], outer_class=root_module['ns3::TapBridge']) ## tap-bridge.h (module 'tap-bridge'): ns3::TapBridgeFdReader [class] module.add_class('TapBridgeFdReader', parent=root_module['ns3::FdReader']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -319,7 +319,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3TapBridge_methods(root_module, root_module['ns3::TapBridge']) register_Ns3TapBridgeFdReader_methods(root_module, root_module['ns3::TapBridgeFdReader']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1676,6 +1675,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -2521,6 +2524,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -3516,6 +3529,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -3710,13 +3727,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/topology-read/bindings/modulegen__gcc_ILP32.py --- a/src/topology-read/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/topology-read/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -134,8 +134,6 @@ module.add_class('OrbisTopologyReader', parent=root_module['ns3::TopologyReader']) ## rocketfuel-topology-reader.h (module 'topology-read'): ns3::RocketfuelTopologyReader [class] module.add_class('RocketfuelTopologyReader', parent=root_module['ns3::TopologyReader']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -209,7 +207,6 @@ register_Ns3Node_methods(root_module, root_module['ns3::Node']) register_Ns3OrbisTopologyReader_methods(root_module, root_module['ns3::OrbisTopologyReader']) register_Ns3RocketfuelTopologyReader_methods(root_module, root_module['ns3::RocketfuelTopologyReader']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1527,6 +1524,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2253,13 +2260,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/topology-read/bindings/modulegen__gcc_LP64.py --- a/src/topology-read/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/topology-read/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -134,8 +134,6 @@ module.add_class('OrbisTopologyReader', parent=root_module['ns3::TopologyReader']) ## rocketfuel-topology-reader.h (module 'topology-read'): ns3::RocketfuelTopologyReader [class] module.add_class('RocketfuelTopologyReader', parent=root_module['ns3::TopologyReader']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -209,7 +207,6 @@ register_Ns3Node_methods(root_module, root_module['ns3::Node']) register_Ns3OrbisTopologyReader_methods(root_module, root_module['ns3::OrbisTopologyReader']) register_Ns3RocketfuelTopologyReader_methods(root_module, root_module['ns3::RocketfuelTopologyReader']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -1527,6 +1524,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -2253,13 +2260,6 @@ is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/uan/bindings/modulegen__gcc_ILP32.py --- a/src/uan/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/uan/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -90,6 +90,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## uan-mac-rc.h (module 'uan'): ns3::Reservation [class] module.add_class('Reservation') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -342,8 +344,6 @@ module.add_class('PointerChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## pointer.h (module 'core'): ns3::PointerValue [class] module.add_class('PointerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -565,7 +565,6 @@ register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) register_Ns3PointerChecker_methods(root_module, root_module['ns3::PointerChecker']) register_Ns3PointerValue_methods(root_module, root_module['ns3::PointerValue']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2009,6 +2008,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3441,6 +3444,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4965,7 +4978,7 @@ cls.add_method('SetRxThresholdDb', 'void', [param('double', 'thresh')], - is_virtual=True) + deprecated=True, is_virtual=True) ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetSinrModelPhy1(ns3::Ptr calcSinr) [member function] cls.add_method('SetSinrModelPhy1', 'void', @@ -7220,6 +7233,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -7319,13 +7336,6 @@ [param('ns3::Ptr< ns3::Object >', 'object')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/uan/bindings/modulegen__gcc_LP64.py --- a/src/uan/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/uan/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -90,6 +90,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## uan-mac-rc.h (module 'uan'): ns3::Reservation [class] module.add_class('Reservation') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -342,8 +344,6 @@ module.add_class('PointerChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## pointer.h (module 'core'): ns3::PointerValue [class] module.add_class('PointerValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -565,7 +565,6 @@ register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) register_Ns3PointerChecker_methods(root_module, root_module['ns3::PointerChecker']) register_Ns3PointerValue_methods(root_module, root_module['ns3::PointerValue']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2009,6 +2008,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -3441,6 +3444,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -4965,7 +4978,7 @@ cls.add_method('SetRxThresholdDb', 'void', [param('double', 'thresh')], - is_virtual=True) + deprecated=True, is_virtual=True) ## uan-phy-dual.h (module 'uan'): void ns3::UanPhyDual::SetSinrModelPhy1(ns3::Ptr calcSinr) [member function] cls.add_method('SetSinrModelPhy1', 'void', @@ -7220,6 +7233,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -7319,13 +7336,6 @@ [param('ns3::Ptr< ns3::Object >', 'object')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/visualizer/bindings/modulegen__gcc_ILP32.py --- a/src/visualizer/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/visualizer/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -130,6 +130,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pyviz.h (module 'visualizer'): ns3::PyViz [class] module.add_class('PyViz') ## pyviz.h (module 'visualizer'): ns3::PyViz::PacketCaptureMode [enumeration] @@ -320,8 +322,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -474,7 +474,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2009,6 +2008,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4034,6 +4037,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5732,6 +5745,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5743,13 +5760,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/visualizer/bindings/modulegen__gcc_LP64.py --- a/src/visualizer/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/visualizer/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -130,6 +130,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pyviz.h (module 'visualizer'): ns3::PyViz [class] module.add_class('PyViz') ## pyviz.h (module 'visualizer'): ns3::PyViz::PacketCaptureMode [enumeration] @@ -320,8 +322,6 @@ module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -474,7 +474,6 @@ register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2009,6 +2008,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -4034,6 +4037,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5732,6 +5745,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -5743,13 +5760,6 @@ [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/wifi/bindings/modulegen__gcc_ILP32.py --- a/src/wifi/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -150,6 +150,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -506,8 +508,6 @@ module.add_class('StaWifiMac', parent=root_module['ns3::RegularWifiMac']) ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class] module.add_class('SupportedRates', parent=root_module['ns3::WifiInformationElement']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -805,7 +805,6 @@ register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) register_Ns3StaWifiMac_methods(root_module, root_module['ns3::StaWifiMac']) register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -3167,6 +3166,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -5542,6 +5545,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5675,14 +5688,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -5696,8 +5705,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -9325,14 +9334,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -9346,8 +9351,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -10885,6 +10890,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -11427,13 +11436,6 @@ cls.add_instance_attribute('extended', 'ns3::ExtendedSupportedRatesIE', is_const=False) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/wifi/bindings/modulegen__gcc_LP64.py --- a/src/wifi/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/wifi/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -150,6 +150,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -506,8 +508,6 @@ module.add_class('StaWifiMac', parent=root_module['ns3::RegularWifiMac']) ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class] module.add_class('SupportedRates', parent=root_module['ns3::WifiInformationElement']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -805,7 +805,6 @@ register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) register_Ns3StaWifiMac_methods(root_module, root_module['ns3::StaWifiMac']) register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -3167,6 +3166,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -5542,6 +5545,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -5675,14 +5688,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -5696,8 +5705,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -9325,14 +9334,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -9346,8 +9351,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -10885,6 +10890,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -11427,13 +11436,6 @@ cls.add_instance_attribute('extended', 'ns3::ExtendedSupportedRatesIE', is_const=False) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/wimax/bindings/modulegen__gcc_ILP32.py --- a/src/wimax/bindings/modulegen__gcc_ILP32.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/wimax/bindings/modulegen__gcc_ILP32.py Thu Jul 04 14:27:35 2013 -0700 @@ -128,6 +128,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -474,8 +476,6 @@ module.add_class('SimpleOfdmWimaxPhy', parent=root_module['ns3::WimaxPhy']) ## simple-ofdm-wimax-phy.h (module 'wimax'): ns3::SimpleOfdmWimaxPhy::FrameDurationCode [enumeration] module.add_enum('FrameDurationCode', ['FRAME_DURATION_2_POINT_5_MS', 'FRAME_DURATION_4_MS', 'FRAME_DURATION_5_MS', 'FRAME_DURATION_8_MS', 'FRAME_DURATION_10_MS', 'FRAME_DURATION_12_POINT_5_MS', 'FRAME_DURATION_20_MS'], outer_class=root_module['ns3::SimpleOfdmWimaxPhy']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -746,7 +746,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) register_Ns3SimpleOfdmWimaxPhy_methods(root_module, root_module['ns3::SimpleOfdmWimaxPhy']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2949,6 +2948,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -6423,6 +6426,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6619,14 +6632,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -6640,8 +6649,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -9378,14 +9387,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -9399,8 +9404,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -10509,6 +10514,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -10743,13 +10752,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([]) diff -r 0799c5d3505f -r 9a100979b2df src/wimax/bindings/modulegen__gcc_LP64.py --- a/src/wimax/bindings/modulegen__gcc_LP64.py Thu Jul 04 16:10:05 2013 +0200 +++ b/src/wimax/bindings/modulegen__gcc_LP64.py Thu Jul 04 14:27:35 2013 -0700 @@ -128,6 +128,8 @@ module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## pcap-file.h (module 'network'): ns3::PcapFile [class] module.add_class('PcapFile', import_from_module='ns.network') ## trace-helper.h (module 'network'): ns3::PcapHelper [class] @@ -474,8 +476,6 @@ module.add_class('SimpleOfdmWimaxPhy', parent=root_module['ns3::WimaxPhy']) ## simple-ofdm-wimax-phy.h (module 'wimax'): ns3::SimpleOfdmWimaxPhy::FrameDurationCode [enumeration] module.add_enum('FrameDurationCode', ['FRAME_DURATION_2_POINT_5_MS', 'FRAME_DURATION_4_MS', 'FRAME_DURATION_5_MS', 'FRAME_DURATION_8_MS', 'FRAME_DURATION_10_MS', 'FRAME_DURATION_12_POINT_5_MS', 'FRAME_DURATION_20_MS'], outer_class=root_module['ns3::SimpleOfdmWimaxPhy']) - ## nstime.h (module 'core'): ns3::TimeChecker [class] - module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] module.add_class('TimeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## type-id.h (module 'core'): ns3::TypeIdChecker [class] @@ -746,7 +746,6 @@ register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3ParetoRandomVariable_methods(root_module, root_module['ns3::ParetoRandomVariable']) register_Ns3SimpleOfdmWimaxPhy_methods(root_module, root_module['ns3::SimpleOfdmWimaxPhy']) - register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) @@ -2949,6 +2948,10 @@ cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -6423,6 +6426,16 @@ 'bool', [], is_const=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MAX() [member function] + cls.add_method('MAX', + 'ns3::Time', + [], + is_static=True) + ## nstime.h (module 'core'): static ns3::Time ns3::Time::MIN() [member function] + cls.add_method('MIN', + 'ns3::Time', + [], + is_static=True) ## nstime.h (module 'core'): static void ns3::Time::SetResolution(ns3::Time::Unit resolution) [member function] cls.add_method('SetResolution', 'void', @@ -6619,14 +6632,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -6640,8 +6649,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -9378,14 +9387,10 @@ is_static=True) ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] cls.add_constructor([]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'frequency'), param('double', 'speed')]) - ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] - cls.add_method('SetLambda', - 'void', - [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetFrequency(double frequency) [member function] + cls.add_method('SetFrequency', + 'void', + [param('double', 'frequency')]) ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] cls.add_method('SetSystemLoss', 'void', @@ -9399,8 +9404,8 @@ 'double', [], is_const=True) - ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] - cls.add_method('GetLambda', + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetFrequency() const [member function] + cls.add_method('GetFrequency', 'double', [], is_const=True) @@ -10509,6 +10514,10 @@ cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -10743,13 +10752,6 @@ visibility='private', is_virtual=True) return -def register_Ns3TimeChecker_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker(ns3::TimeChecker const & arg0) [copy constructor] - cls.add_constructor([param('ns3::TimeChecker const &', 'arg0')]) - return - def register_Ns3TimeValue_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] cls.add_constructor([])