From dc67e4a6b65d9bb878cd241aa03b29501ff920f4 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Fri, 31 Aug 2018 19:52:39 +0200 Subject: [PATCH] topology-read: rescan bindings --- .../bindings/modulegen__gcc_ILP32.py | 424 +----------------- .../bindings/modulegen__gcc_LP64.py | 424 +----------------- 2 files changed, 4 insertions(+), 844 deletions(-) diff --git a/src/topology-read/bindings/modulegen__gcc_ILP32.py b/src/topology-read/bindings/modulegen__gcc_ILP32.py index 134a00101..893da2f9a 100644 --- a/src/topology-read/bindings/modulegen__gcc_ILP32.py +++ b/src/topology-read/bindings/modulegen__gcc_ILP32.py @@ -88,11 +88,6 @@ def register_types(module): module.add_class('Mac8Address', import_from_module='ns.network') ## mac8-address.h (module 'network'): ns3::Mac8Address [class] root_module['ns3::Mac8Address'].implicitly_converts_to(root_module['ns3::Address']) - ## node-container.h (module 'network'): ns3::NodeContainer [class] - module.add_class('NodeContainer', import_from_module='ns.network') - typehandlers.add_type_alias(u'std::vector< ns3::Ptr< ns3::Node > > const_iterator', u'ns3::NodeContainer::Iterator') - typehandlers.add_type_alias(u'std::vector< ns3::Ptr< ns3::Node > > const_iterator*', u'ns3::NodeContainer::Iterator*') - typehandlers.add_type_alias(u'std::vector< ns3::Ptr< ns3::Node > > const_iterator&', u'ns3::NodeContainer::Iterator&') ## object-base.h (module 'core'): ns3::ObjectBase [class] module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core') ## object.h (module 'core'): ns3::ObjectDeleter [struct] @@ -119,8 +114,6 @@ def register_types(module): module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] module.add_class('TagBuffer', import_from_module='ns.network') - ## nstime.h (module 'core'): ns3::TimeWithUnit [class] - module.add_class('TimeWithUnit', import_from_module='ns.core') ## topology-reader-helper.h (module 'topology-read'): ns3::TopologyReaderHelper [class] module.add_class('TopologyReaderHelper') ## type-id.h (module 'core'): ns3::TypeId [class] @@ -138,10 +131,6 @@ def register_types(module): typehandlers.add_type_alias(u'uint32_t&', u'ns3::TypeId::hash_t&') ## empty.h (module 'core'): ns3::empty [class] module.add_class('empty', import_from_module='ns.core') - ## int64x64-128.h (module 'core'): ns3::int64x64_t [class] - module.add_class('int64x64_t', import_from_module='ns.core') - ## int64x64-128.h (module 'core'): ns3::int64x64_t::impl_type [enumeration] - module.add_enum('impl_type', ['int128_impl', 'cairo_impl', 'ld_impl'], outer_class=root_module['ns3::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']) ## header.h (module 'network'): ns3::Header [class] @@ -166,15 +155,6 @@ def register_types(module): module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) - ## nstime.h (module 'core'): ns3::Time [class] - module.add_class('Time', import_from_module='ns.core') - ## nstime.h (module 'core'): ns3::Time::Unit [enumeration] - module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time )', u'ns3::Time::TracedCallback') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time )*', u'ns3::Time::TracedCallback*') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time )&', u'ns3::Time::TracedCallback&') - ## nstime.h (module 'core'): ns3::Time [class] - root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t']) ## topology-reader.h (module 'topology-read'): ns3::TopologyReader [class] module.add_class('TopologyReader', parent=root_module['ns3::Object']) ## topology-reader.h (module 'topology-read'): ns3::TopologyReader::Link [class] @@ -276,8 +256,6 @@ def register_types(module): typehandlers.add_type_alias(u'void ( * ) ( ns3::Ptr< ns3::Packet const >, double )&', u'ns3::Packet::SinrTracedCallback&') ## rocketfuel-topology-reader.h (module 'topology-read'): ns3::RocketfuelTopologyReader [class] module.add_class('RocketfuelTopologyReader', parent=root_module['ns3::TopologyReader']) - ## 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] module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## type-id.h (module 'core'): ns3::TypeIdValue [class] @@ -305,12 +283,6 @@ def register_types(module): nested_module = module.add_cpp_namespace('Hash') register_types_ns3_Hash(nested_module) - - ## Register a nested module for the namespace TracedValueCallback - - nested_module = module.add_cpp_namespace('TracedValueCallback') - register_types_ns3_TracedValueCallback(nested_module) - def register_types_ns3_FatalImpl(module): root_module = module.get_root() @@ -346,13 +318,6 @@ def register_types_ns3_Hash_Function(module): ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class] module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation']) -def register_types_ns3_TracedValueCallback(module): - root_module = module.get_root() - - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time )', u'ns3::TracedValueCallback::Time') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time )*', u'ns3::TracedValueCallback::Time*') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time )&', u'ns3::TracedValueCallback::Time&') - def register_methods(root_module): register_Ns3Address_methods(root_module, root_module['ns3::Address']) register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList']) @@ -380,7 +345,6 @@ def register_methods(root_module): register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3Mac8Address_methods(root_module, root_module['ns3::Mac8Address']) - register_Ns3NodeContainer_methods(root_module, root_module['ns3::NodeContainer']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata']) @@ -393,13 +357,11 @@ def register_methods(root_module): register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) - register_Ns3TimeWithUnit_methods(root_module, root_module['ns3::TimeWithUnit']) register_Ns3TopologyReaderHelper_methods(root_module, root_module['ns3::TopologyReaderHelper']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation']) register_Ns3TypeIdTraceSourceInformation_methods(root_module, root_module['ns3::TypeId::TraceSourceInformation']) 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_Ns3Header_methods(root_module, root_module['ns3::Header']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) @@ -412,7 +374,6 @@ def register_methods(root_module): register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >']) - register_Ns3Time_methods(root_module, root_module['ns3::Time']) register_Ns3TopologyReader_methods(root_module, root_module['ns3::TopologyReader']) register_Ns3TopologyReaderLink_methods(root_module, root_module['ns3::TopologyReader::Link']) register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor']) @@ -443,7 +404,6 @@ def register_methods(root_module): register_Ns3OrbisTopologyReader_methods(root_module, root_module['ns3::OrbisTopologyReader']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3RocketfuelTopologyReader_methods(root_module, root_module['ns3::RocketfuelTopologyReader']) - 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']) register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker']) @@ -1317,7 +1277,7 @@ def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_method('IsAllHostsMulticast', 'bool', [], - deprecated=True, is_const=True) + is_const=True) ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function] cls.add_method('IsAllNodesMulticast', 'bool', @@ -1620,75 +1580,6 @@ def register_Ns3Mac8Address_methods(root_module, cls): is_static=True) return -def register_Ns3NodeContainer_methods(root_module, cls): - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & arg0) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'arg0')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer() [constructor] - cls.add_constructor([]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::Ptr node) [constructor] - cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(std::string nodeName) [constructor] - cls.add_constructor([param('std::string', 'nodeName')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d, ns3::NodeContainer const & e) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd'), param('ns3::NodeContainer const &', 'e')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::NodeContainer other) [member function] - cls.add_method('Add', - 'void', - [param('ns3::NodeContainer', 'other')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::Ptr node) [member function] - cls.add_method('Add', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Add(std::string nodeName) [member function] - cls.add_method('Add', - 'void', - [param('std::string', 'nodeName')]) - ## node-container.h (module 'network'): ns3::NodeContainer::Iterator ns3::NodeContainer::Begin() const [member function] - cls.add_method('Begin', - 'ns3::NodeContainer::Iterator', - [], - is_const=True) - ## node-container.h (module 'network'): bool ns3::NodeContainer::Contains(uint32_t id) const [member function] - cls.add_method('Contains', - 'bool', - [param('uint32_t', 'id')], - is_const=True) - ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n) [member function] - cls.add_method('Create', - 'void', - [param('uint32_t', 'n')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n, uint32_t systemId) [member function] - cls.add_method('Create', - 'void', - [param('uint32_t', 'n'), param('uint32_t', 'systemId')]) - ## node-container.h (module 'network'): ns3::NodeContainer::Iterator ns3::NodeContainer::End() const [member function] - cls.add_method('End', - 'ns3::NodeContainer::Iterator', - [], - is_const=True) - ## node-container.h (module 'network'): ns3::Ptr ns3::NodeContainer::Get(uint32_t i) const [member function] - cls.add_method('Get', - 'ns3::Ptr< ns3::Node >', - [param('uint32_t', 'i')], - is_const=True) - ## node-container.h (module 'network'): static ns3::NodeContainer ns3::NodeContainer::GetGlobal() [member function] - cls.add_method('GetGlobal', - 'ns3::NodeContainer', - [], - is_static=True) - ## node-container.h (module 'network'): uint32_t ns3::NodeContainer::GetN() const [member function] - cls.add_method('GetN', - 'uint32_t', - [], - is_const=True) - return - def register_Ns3ObjectBase_methods(root_module, cls): ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor] cls.add_constructor([]) @@ -2059,14 +1950,6 @@ def register_Ns3TagBuffer_methods(root_module, cls): [param('uint8_t', 'v')]) return -def register_Ns3TimeWithUnit_methods(root_module, cls): - cls.add_output_stream_operator() - ## nstime.h (module 'core'): ns3::TimeWithUnit::TimeWithUnit(ns3::TimeWithUnit const & arg0) [constructor] - cls.add_constructor([param('ns3::TimeWithUnit const &', 'arg0')]) - ## nstime.h (module 'core'): ns3::TimeWithUnit::TimeWithUnit(ns3::Time const time, ns3::Time::Unit const unit) [constructor] - cls.add_constructor([param('ns3::Time const', 'time'), param('ns3::Time::Unit const', 'unit')]) - return - def register_Ns3TopologyReaderHelper_methods(root_module, cls): ## topology-reader-helper.h (module 'topology-read'): ns3::TopologyReaderHelper::TopologyReaderHelper(ns3::TopologyReaderHelper const & arg0) [constructor] cls.add_constructor([param('ns3::TopologyReaderHelper const &', 'arg0')]) @@ -2108,8 +1991,7 @@ def register_Ns3TypeId_methods(root_module, cls): ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor) [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', - [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')], - deprecated=True) + [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')]) ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor, std::string callback, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SupportLevel::SUPPORTED, std::string const & supportMsg="") [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', @@ -2310,73 +2192,6 @@ def register_Ns3Empty_methods(root_module, cls): cls.add_constructor([param('ns3::empty const &', 'arg0')]) return -def register_Ns3Int64x64_t_methods(root_module, cls): - cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - 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('==') - cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('>') - cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right')) - cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right')) - cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right')) - cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right')) - cls.add_unary_numeric_operator('-') - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor] - cls.add_constructor([]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(double const value) [constructor] - cls.add_constructor([param('double const', 'value')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long double const value) [constructor] - cls.add_constructor([param('long double const', 'value')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(int const v) [constructor] - cls.add_constructor([param('int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long int const v) [constructor] - cls.add_constructor([param('long int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long long int const v) [constructor] - cls.add_constructor([param('long long int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(unsigned int const v) [constructor] - cls.add_constructor([param('unsigned int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long unsigned int const v) [constructor] - cls.add_constructor([param('long unsigned int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long long unsigned int const v) [constructor] - cls.add_constructor([param('long long unsigned int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(int64_t const hi, uint64_t const lo) [constructor] - cls.add_constructor([param('int64_t const', 'hi'), param('uint64_t const', 'lo')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(ns3::int64x64_t const & o) [constructor] - cls.add_constructor([param('ns3::int64x64_t const &', 'o')]) - ## int64x64-128.h (module 'core'): double ns3::int64x64_t::GetDouble() const [member function] - cls.add_method('GetDouble', - 'double', - [], - is_const=True) - ## int64x64-128.h (module 'core'): int64_t ns3::int64x64_t::GetHigh() const [member function] - cls.add_method('GetHigh', - 'int64_t', - [], - is_const=True) - ## int64x64-128.h (module 'core'): uint64_t ns3::int64x64_t::GetLow() const [member function] - cls.add_method('GetLow', - 'uint64_t', - [], - is_const=True) - ## int64x64-128.h (module 'core'): static ns3::int64x64_t ns3::int64x64_t::Invert(uint64_t const v) [member function] - cls.add_method('Invert', - 'ns3::int64x64_t', - [param('uint64_t const', 'v')], - is_static=True) - ## int64x64-128.h (module 'core'): void ns3::int64x64_t::MulByInvert(ns3::int64x64_t const & o) [member function] - cls.add_method('MulByInvert', - 'void', - [param('ns3::int64x64_t const &', 'o')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::implementation [variable] - cls.add_static_attribute('implementation', 'ns3::int64x64_t::impl_type const', is_const=True) - return - def register_Ns3Chunk_methods(root_module, cls): ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor] cls.add_constructor([]) @@ -2564,204 +2379,6 @@ def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDelete cls.add_constructor([param('ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter< ns3::TraceSourceAccessor > > const &', 'o')]) return -def register_Ns3Time_methods(root_module, cls): - cls.add_binary_comparison_operator('==') - cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<=') - cls.add_binary_comparison_operator('>=') - cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('>') - cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) - cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) - cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right')) - cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right')) - cls.add_output_stream_operator() - ## nstime.h (module 'core'): ns3::Time::Time() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::Time::Time(ns3::Time const & o) [constructor] - cls.add_constructor([param('ns3::Time const &', 'o')]) - ## nstime.h (module 'core'): ns3::Time::Time(double v) [constructor] - cls.add_constructor([param('double', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(int v) [constructor] - cls.add_constructor([param('int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long int v) [constructor] - cls.add_constructor([param('long int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long long int v) [constructor] - cls.add_constructor([param('long long int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(unsigned int v) [constructor] - cls.add_constructor([param('unsigned int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long unsigned int v) [constructor] - cls.add_constructor([param('long unsigned int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor] - cls.add_constructor([param('long long unsigned int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & v) [constructor] - cls.add_constructor([param('ns3::int64x64_t const &', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor] - cls.add_constructor([param('std::string const &', 's')]) - ## nstime.h (module 'core'): ns3::TimeWithUnit ns3::Time::As(ns3::Time::Unit const unit) const [member function] - cls.add_method('As', - 'ns3::TimeWithUnit', - [param('ns3::Time::Unit const', 'unit')], - is_const=True) - ## nstime.h (module 'core'): int ns3::Time::Compare(ns3::Time const & o) const [member function] - cls.add_method('Compare', - 'int', - [param('ns3::Time const &', 'o')], - is_const=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function] - cls.add_method('From', - 'ns3::Time', - [param('ns3::int64x64_t const &', 'value')], - is_static=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value, ns3::Time::Unit unit) [member function] - cls.add_method('From', - 'ns3::Time', - [param('ns3::int64x64_t const &', 'value'), param('ns3::Time::Unit', 'unit')], - is_static=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit unit) [member function] - cls.add_method('FromDouble', - 'ns3::Time', - [param('double', 'value'), param('ns3::Time::Unit', 'unit')], - is_static=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit unit) [member function] - cls.add_method('FromInteger', - 'ns3::Time', - [param('uint64_t', 'value'), param('ns3::Time::Unit', 'unit')], - is_static=True) - ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function] - cls.add_method('GetDays', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function] - cls.add_method('GetDouble', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetFemtoSeconds() const [member function] - cls.add_method('GetFemtoSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function] - cls.add_method('GetHours', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function] - cls.add_method('GetInteger', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetMicroSeconds() const [member function] - cls.add_method('GetMicroSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetMilliSeconds() const [member function] - cls.add_method('GetMilliSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function] - cls.add_method('GetMinutes', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function] - cls.add_method('GetNanoSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetPicoSeconds() const [member function] - cls.add_method('GetPicoSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): static ns3::Time::Unit ns3::Time::GetResolution() [member function] - cls.add_method('GetResolution', - 'ns3::Time::Unit', - [], - is_static=True) - ## nstime.h (module 'core'): double ns3::Time::GetSeconds() const [member function] - cls.add_method('GetSeconds', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetTimeStep() const [member function] - cls.add_method('GetTimeStep', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function] - cls.add_method('GetYears', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function] - cls.add_method('IsNegative', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsPositive() const [member function] - cls.add_method('IsPositive', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyNegative() const [member function] - cls.add_method('IsStrictlyNegative', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyPositive() const [member function] - cls.add_method('IsStrictlyPositive', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsZero() const [member function] - cls.add_method('IsZero', - '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', - [param('ns3::Time::Unit', 'resolution')], - is_static=True) - ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function] - cls.add_method('StaticInit', - 'bool', - [], - is_static=True) - ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit unit) const [member function] - cls.add_method('To', - 'ns3::int64x64_t', - [param('ns3::Time::Unit', 'unit')], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit unit) const [member function] - cls.add_method('ToDouble', - 'double', - [param('ns3::Time::Unit', 'unit')], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit unit) const [member function] - cls.add_method('ToInteger', - 'int64_t', - [param('ns3::Time::Unit', 'unit')], - is_const=True) - return - def register_Ns3TopologyReader_methods(root_module, cls): ## topology-reader.h (module 'topology-read'): ns3::TopologyReader::TopologyReader() [constructor] cls.add_constructor([]) @@ -3898,39 +3515,6 @@ def register_Ns3RocketfuelTopologyReader_methods(root_module, cls): is_virtual=True) return -def register_Ns3TimeValue_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::Time const & value) [constructor] - cls.add_constructor([param('ns3::Time const &', 'value')]) - ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::TimeValue const & arg0) [constructor] - cls.add_constructor([param('ns3::TimeValue const &', 'arg0')]) - ## nstime.h (module 'core'): ns3::Ptr ns3::TimeValue::Copy() const [member function] - cls.add_method('Copy', - 'ns3::Ptr< ns3::AttributeValue >', - [], - is_const=True, is_virtual=True) - ## nstime.h (module 'core'): bool ns3::TimeValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] - cls.add_method('DeserializeFromString', - 'bool', - [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], - is_virtual=True) - ## nstime.h (module 'core'): ns3::Time ns3::TimeValue::Get() const [member function] - cls.add_method('Get', - 'ns3::Time', - [], - is_const=True) - ## nstime.h (module 'core'): std::string ns3::TimeValue::SerializeToString(ns3::Ptr checker) const [member function] - cls.add_method('SerializeToString', - 'std::string', - [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], - is_const=True, is_virtual=True) - ## nstime.h (module 'core'): void ns3::TimeValue::Set(ns3::Time const & value) [member function] - cls.add_method('Set', - 'void', - [param('ns3::Time const &', 'value')]) - return - def register_Ns3TypeIdChecker_methods(root_module, cls): ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker() [constructor] cls.add_constructor([]) @@ -4186,7 +3770,6 @@ def register_functions(root_module): module = root_module register_functions_ns3_FatalImpl(module.add_cpp_namespace('FatalImpl'), root_module) register_functions_ns3_Hash(module.add_cpp_namespace('Hash'), root_module) - register_functions_ns3_TracedValueCallback(module.add_cpp_namespace('TracedValueCallback'), root_module) return def register_functions_ns3_FatalImpl(module, root_module): @@ -4199,9 +3782,6 @@ def register_functions_ns3_Hash(module, root_module): def register_functions_ns3_Hash_Function(module, root_module): return -def register_functions_ns3_TracedValueCallback(module, root_module): - return - def main(): out = FileCodeSink(sys.stdout) root_module = module_init() diff --git a/src/topology-read/bindings/modulegen__gcc_LP64.py b/src/topology-read/bindings/modulegen__gcc_LP64.py index 134a00101..893da2f9a 100644 --- a/src/topology-read/bindings/modulegen__gcc_LP64.py +++ b/src/topology-read/bindings/modulegen__gcc_LP64.py @@ -88,11 +88,6 @@ def register_types(module): module.add_class('Mac8Address', import_from_module='ns.network') ## mac8-address.h (module 'network'): ns3::Mac8Address [class] root_module['ns3::Mac8Address'].implicitly_converts_to(root_module['ns3::Address']) - ## node-container.h (module 'network'): ns3::NodeContainer [class] - module.add_class('NodeContainer', import_from_module='ns.network') - typehandlers.add_type_alias(u'std::vector< ns3::Ptr< ns3::Node > > const_iterator', u'ns3::NodeContainer::Iterator') - typehandlers.add_type_alias(u'std::vector< ns3::Ptr< ns3::Node > > const_iterator*', u'ns3::NodeContainer::Iterator*') - typehandlers.add_type_alias(u'std::vector< ns3::Ptr< ns3::Node > > const_iterator&', u'ns3::NodeContainer::Iterator&') ## object-base.h (module 'core'): ns3::ObjectBase [class] module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core') ## object.h (module 'core'): ns3::ObjectDeleter [struct] @@ -119,8 +114,6 @@ def register_types(module): module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] module.add_class('TagBuffer', import_from_module='ns.network') - ## nstime.h (module 'core'): ns3::TimeWithUnit [class] - module.add_class('TimeWithUnit', import_from_module='ns.core') ## topology-reader-helper.h (module 'topology-read'): ns3::TopologyReaderHelper [class] module.add_class('TopologyReaderHelper') ## type-id.h (module 'core'): ns3::TypeId [class] @@ -138,10 +131,6 @@ def register_types(module): typehandlers.add_type_alias(u'uint32_t&', u'ns3::TypeId::hash_t&') ## empty.h (module 'core'): ns3::empty [class] module.add_class('empty', import_from_module='ns.core') - ## int64x64-128.h (module 'core'): ns3::int64x64_t [class] - module.add_class('int64x64_t', import_from_module='ns.core') - ## int64x64-128.h (module 'core'): ns3::int64x64_t::impl_type [enumeration] - module.add_enum('impl_type', ['int128_impl', 'cairo_impl', 'ld_impl'], outer_class=root_module['ns3::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']) ## header.h (module 'network'): ns3::Header [class] @@ -166,15 +155,6 @@ def register_types(module): module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::TraceSourceAccessor', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) - ## nstime.h (module 'core'): ns3::Time [class] - module.add_class('Time', import_from_module='ns.core') - ## nstime.h (module 'core'): ns3::Time::Unit [enumeration] - module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time )', u'ns3::Time::TracedCallback') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time )*', u'ns3::Time::TracedCallback*') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time )&', u'ns3::Time::TracedCallback&') - ## nstime.h (module 'core'): ns3::Time [class] - root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t']) ## topology-reader.h (module 'topology-read'): ns3::TopologyReader [class] module.add_class('TopologyReader', parent=root_module['ns3::Object']) ## topology-reader.h (module 'topology-read'): ns3::TopologyReader::Link [class] @@ -276,8 +256,6 @@ def register_types(module): typehandlers.add_type_alias(u'void ( * ) ( ns3::Ptr< ns3::Packet const >, double )&', u'ns3::Packet::SinrTracedCallback&') ## rocketfuel-topology-reader.h (module 'topology-read'): ns3::RocketfuelTopologyReader [class] module.add_class('RocketfuelTopologyReader', parent=root_module['ns3::TopologyReader']) - ## 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] module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## type-id.h (module 'core'): ns3::TypeIdValue [class] @@ -305,12 +283,6 @@ def register_types(module): nested_module = module.add_cpp_namespace('Hash') register_types_ns3_Hash(nested_module) - - ## Register a nested module for the namespace TracedValueCallback - - nested_module = module.add_cpp_namespace('TracedValueCallback') - register_types_ns3_TracedValueCallback(nested_module) - def register_types_ns3_FatalImpl(module): root_module = module.get_root() @@ -346,13 +318,6 @@ def register_types_ns3_Hash_Function(module): ## hash-murmur3.h (module 'core'): ns3::Hash::Function::Murmur3 [class] module.add_class('Murmur3', import_from_module='ns.core', parent=root_module['ns3::Hash::Implementation']) -def register_types_ns3_TracedValueCallback(module): - root_module = module.get_root() - - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time )', u'ns3::TracedValueCallback::Time') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time )*', u'ns3::TracedValueCallback::Time*') - typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time )&', u'ns3::TracedValueCallback::Time&') - def register_methods(root_module): register_Ns3Address_methods(root_module, root_module['ns3::Address']) register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList']) @@ -380,7 +345,6 @@ def register_methods(root_module): register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3Mac8Address_methods(root_module, root_module['ns3::Mac8Address']) - register_Ns3NodeContainer_methods(root_module, root_module['ns3::NodeContainer']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata']) @@ -393,13 +357,11 @@ def register_methods(root_module): register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) - register_Ns3TimeWithUnit_methods(root_module, root_module['ns3::TimeWithUnit']) register_Ns3TopologyReaderHelper_methods(root_module, root_module['ns3::TopologyReaderHelper']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation']) register_Ns3TypeIdTraceSourceInformation_methods(root_module, root_module['ns3::TypeId::TraceSourceInformation']) 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_Ns3Header_methods(root_module, root_module['ns3::Header']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) @@ -412,7 +374,6 @@ def register_methods(root_module): register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3TraceSourceAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >']) - register_Ns3Time_methods(root_module, root_module['ns3::Time']) register_Ns3TopologyReader_methods(root_module, root_module['ns3::TopologyReader']) register_Ns3TopologyReaderLink_methods(root_module, root_module['ns3::TopologyReader::Link']) register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor']) @@ -443,7 +404,6 @@ def register_methods(root_module): register_Ns3OrbisTopologyReader_methods(root_module, root_module['ns3::OrbisTopologyReader']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3RocketfuelTopologyReader_methods(root_module, root_module['ns3::RocketfuelTopologyReader']) - 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']) register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker']) @@ -1317,7 +1277,7 @@ def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_method('IsAllHostsMulticast', 'bool', [], - deprecated=True, is_const=True) + is_const=True) ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function] cls.add_method('IsAllNodesMulticast', 'bool', @@ -1620,75 +1580,6 @@ def register_Ns3Mac8Address_methods(root_module, cls): is_static=True) return -def register_Ns3NodeContainer_methods(root_module, cls): - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & arg0) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'arg0')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer() [constructor] - cls.add_constructor([]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::Ptr node) [constructor] - cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(std::string nodeName) [constructor] - cls.add_constructor([param('std::string', 'nodeName')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd')]) - ## node-container.h (module 'network'): ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c, ns3::NodeContainer const & d, ns3::NodeContainer const & e) [constructor] - cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b'), param('ns3::NodeContainer const &', 'c'), param('ns3::NodeContainer const &', 'd'), param('ns3::NodeContainer const &', 'e')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::NodeContainer other) [member function] - cls.add_method('Add', - 'void', - [param('ns3::NodeContainer', 'other')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Add(ns3::Ptr node) [member function] - cls.add_method('Add', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Add(std::string nodeName) [member function] - cls.add_method('Add', - 'void', - [param('std::string', 'nodeName')]) - ## node-container.h (module 'network'): ns3::NodeContainer::Iterator ns3::NodeContainer::Begin() const [member function] - cls.add_method('Begin', - 'ns3::NodeContainer::Iterator', - [], - is_const=True) - ## node-container.h (module 'network'): bool ns3::NodeContainer::Contains(uint32_t id) const [member function] - cls.add_method('Contains', - 'bool', - [param('uint32_t', 'id')], - is_const=True) - ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n) [member function] - cls.add_method('Create', - 'void', - [param('uint32_t', 'n')]) - ## node-container.h (module 'network'): void ns3::NodeContainer::Create(uint32_t n, uint32_t systemId) [member function] - cls.add_method('Create', - 'void', - [param('uint32_t', 'n'), param('uint32_t', 'systemId')]) - ## node-container.h (module 'network'): ns3::NodeContainer::Iterator ns3::NodeContainer::End() const [member function] - cls.add_method('End', - 'ns3::NodeContainer::Iterator', - [], - is_const=True) - ## node-container.h (module 'network'): ns3::Ptr ns3::NodeContainer::Get(uint32_t i) const [member function] - cls.add_method('Get', - 'ns3::Ptr< ns3::Node >', - [param('uint32_t', 'i')], - is_const=True) - ## node-container.h (module 'network'): static ns3::NodeContainer ns3::NodeContainer::GetGlobal() [member function] - cls.add_method('GetGlobal', - 'ns3::NodeContainer', - [], - is_static=True) - ## node-container.h (module 'network'): uint32_t ns3::NodeContainer::GetN() const [member function] - cls.add_method('GetN', - 'uint32_t', - [], - is_const=True) - return - def register_Ns3ObjectBase_methods(root_module, cls): ## object-base.h (module 'core'): ns3::ObjectBase::ObjectBase() [constructor] cls.add_constructor([]) @@ -2059,14 +1950,6 @@ def register_Ns3TagBuffer_methods(root_module, cls): [param('uint8_t', 'v')]) return -def register_Ns3TimeWithUnit_methods(root_module, cls): - cls.add_output_stream_operator() - ## nstime.h (module 'core'): ns3::TimeWithUnit::TimeWithUnit(ns3::TimeWithUnit const & arg0) [constructor] - cls.add_constructor([param('ns3::TimeWithUnit const &', 'arg0')]) - ## nstime.h (module 'core'): ns3::TimeWithUnit::TimeWithUnit(ns3::Time const time, ns3::Time::Unit const unit) [constructor] - cls.add_constructor([param('ns3::Time const', 'time'), param('ns3::Time::Unit const', 'unit')]) - return - def register_Ns3TopologyReaderHelper_methods(root_module, cls): ## topology-reader-helper.h (module 'topology-read'): ns3::TopologyReaderHelper::TopologyReaderHelper(ns3::TopologyReaderHelper const & arg0) [constructor] cls.add_constructor([param('ns3::TopologyReaderHelper const &', 'arg0')]) @@ -2108,8 +1991,7 @@ def register_Ns3TypeId_methods(root_module, cls): ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor) [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', - [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')], - deprecated=True) + [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')]) ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor, std::string callback, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SupportLevel::SUPPORTED, std::string const & supportMsg="") [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', @@ -2310,73 +2192,6 @@ def register_Ns3Empty_methods(root_module, cls): cls.add_constructor([param('ns3::empty const &', 'arg0')]) return -def register_Ns3Int64x64_t_methods(root_module, cls): - cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) - 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('==') - cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('>') - cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right')) - cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right')) - cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right')) - cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right')) - cls.add_unary_numeric_operator('-') - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor] - cls.add_constructor([]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(double const value) [constructor] - cls.add_constructor([param('double const', 'value')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long double const value) [constructor] - cls.add_constructor([param('long double const', 'value')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(int const v) [constructor] - cls.add_constructor([param('int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long int const v) [constructor] - cls.add_constructor([param('long int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long long int const v) [constructor] - cls.add_constructor([param('long long int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(unsigned int const v) [constructor] - cls.add_constructor([param('unsigned int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long unsigned int const v) [constructor] - cls.add_constructor([param('long unsigned int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(long long unsigned int const v) [constructor] - cls.add_constructor([param('long long unsigned int const', 'v')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(int64_t const hi, uint64_t const lo) [constructor] - cls.add_constructor([param('int64_t const', 'hi'), param('uint64_t const', 'lo')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::int64x64_t(ns3::int64x64_t const & o) [constructor] - cls.add_constructor([param('ns3::int64x64_t const &', 'o')]) - ## int64x64-128.h (module 'core'): double ns3::int64x64_t::GetDouble() const [member function] - cls.add_method('GetDouble', - 'double', - [], - is_const=True) - ## int64x64-128.h (module 'core'): int64_t ns3::int64x64_t::GetHigh() const [member function] - cls.add_method('GetHigh', - 'int64_t', - [], - is_const=True) - ## int64x64-128.h (module 'core'): uint64_t ns3::int64x64_t::GetLow() const [member function] - cls.add_method('GetLow', - 'uint64_t', - [], - is_const=True) - ## int64x64-128.h (module 'core'): static ns3::int64x64_t ns3::int64x64_t::Invert(uint64_t const v) [member function] - cls.add_method('Invert', - 'ns3::int64x64_t', - [param('uint64_t const', 'v')], - is_static=True) - ## int64x64-128.h (module 'core'): void ns3::int64x64_t::MulByInvert(ns3::int64x64_t const & o) [member function] - cls.add_method('MulByInvert', - 'void', - [param('ns3::int64x64_t const &', 'o')]) - ## int64x64-128.h (module 'core'): ns3::int64x64_t::implementation [variable] - cls.add_static_attribute('implementation', 'ns3::int64x64_t::impl_type const', is_const=True) - return - def register_Ns3Chunk_methods(root_module, cls): ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor] cls.add_constructor([]) @@ -2564,204 +2379,6 @@ def register_Ns3SimpleRefCount__Ns3TraceSourceAccessor_Ns3Empty_Ns3DefaultDelete cls.add_constructor([param('ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter< ns3::TraceSourceAccessor > > const &', 'o')]) return -def register_Ns3Time_methods(root_module, cls): - cls.add_binary_comparison_operator('==') - cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<=') - cls.add_binary_comparison_operator('>=') - cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('>') - cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) - cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) - cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right')) - cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right')) - cls.add_output_stream_operator() - ## nstime.h (module 'core'): ns3::Time::Time() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::Time::Time(ns3::Time const & o) [constructor] - cls.add_constructor([param('ns3::Time const &', 'o')]) - ## nstime.h (module 'core'): ns3::Time::Time(double v) [constructor] - cls.add_constructor([param('double', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(int v) [constructor] - cls.add_constructor([param('int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long int v) [constructor] - cls.add_constructor([param('long int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long long int v) [constructor] - cls.add_constructor([param('long long int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(unsigned int v) [constructor] - cls.add_constructor([param('unsigned int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long unsigned int v) [constructor] - cls.add_constructor([param('long unsigned int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor] - cls.add_constructor([param('long long unsigned int', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & v) [constructor] - cls.add_constructor([param('ns3::int64x64_t const &', 'v')]) - ## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor] - cls.add_constructor([param('std::string const &', 's')]) - ## nstime.h (module 'core'): ns3::TimeWithUnit ns3::Time::As(ns3::Time::Unit const unit) const [member function] - cls.add_method('As', - 'ns3::TimeWithUnit', - [param('ns3::Time::Unit const', 'unit')], - is_const=True) - ## nstime.h (module 'core'): int ns3::Time::Compare(ns3::Time const & o) const [member function] - cls.add_method('Compare', - 'int', - [param('ns3::Time const &', 'o')], - is_const=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function] - cls.add_method('From', - 'ns3::Time', - [param('ns3::int64x64_t const &', 'value')], - is_static=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value, ns3::Time::Unit unit) [member function] - cls.add_method('From', - 'ns3::Time', - [param('ns3::int64x64_t const &', 'value'), param('ns3::Time::Unit', 'unit')], - is_static=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit unit) [member function] - cls.add_method('FromDouble', - 'ns3::Time', - [param('double', 'value'), param('ns3::Time::Unit', 'unit')], - is_static=True) - ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit unit) [member function] - cls.add_method('FromInteger', - 'ns3::Time', - [param('uint64_t', 'value'), param('ns3::Time::Unit', 'unit')], - is_static=True) - ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function] - cls.add_method('GetDays', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function] - cls.add_method('GetDouble', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetFemtoSeconds() const [member function] - cls.add_method('GetFemtoSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function] - cls.add_method('GetHours', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function] - cls.add_method('GetInteger', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetMicroSeconds() const [member function] - cls.add_method('GetMicroSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetMilliSeconds() const [member function] - cls.add_method('GetMilliSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function] - cls.add_method('GetMinutes', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function] - cls.add_method('GetNanoSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetPicoSeconds() const [member function] - cls.add_method('GetPicoSeconds', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): static ns3::Time::Unit ns3::Time::GetResolution() [member function] - cls.add_method('GetResolution', - 'ns3::Time::Unit', - [], - is_static=True) - ## nstime.h (module 'core'): double ns3::Time::GetSeconds() const [member function] - cls.add_method('GetSeconds', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::GetTimeStep() const [member function] - cls.add_method('GetTimeStep', - 'int64_t', - [], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function] - cls.add_method('GetYears', - 'double', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function] - cls.add_method('IsNegative', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsPositive() const [member function] - cls.add_method('IsPositive', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyNegative() const [member function] - cls.add_method('IsStrictlyNegative', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsStrictlyPositive() const [member function] - cls.add_method('IsStrictlyPositive', - 'bool', - [], - is_const=True) - ## nstime.h (module 'core'): bool ns3::Time::IsZero() const [member function] - cls.add_method('IsZero', - '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', - [param('ns3::Time::Unit', 'resolution')], - is_static=True) - ## nstime.h (module 'core'): static bool ns3::Time::StaticInit() [member function] - cls.add_method('StaticInit', - 'bool', - [], - is_static=True) - ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit unit) const [member function] - cls.add_method('To', - 'ns3::int64x64_t', - [param('ns3::Time::Unit', 'unit')], - is_const=True) - ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit unit) const [member function] - cls.add_method('ToDouble', - 'double', - [param('ns3::Time::Unit', 'unit')], - is_const=True) - ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit unit) const [member function] - cls.add_method('ToInteger', - 'int64_t', - [param('ns3::Time::Unit', 'unit')], - is_const=True) - return - def register_Ns3TopologyReader_methods(root_module, cls): ## topology-reader.h (module 'topology-read'): ns3::TopologyReader::TopologyReader() [constructor] cls.add_constructor([]) @@ -3898,39 +3515,6 @@ def register_Ns3RocketfuelTopologyReader_methods(root_module, cls): is_virtual=True) return -def register_Ns3TimeValue_methods(root_module, cls): - ## nstime.h (module 'core'): ns3::TimeValue::TimeValue() [constructor] - cls.add_constructor([]) - ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::Time const & value) [constructor] - cls.add_constructor([param('ns3::Time const &', 'value')]) - ## nstime.h (module 'core'): ns3::TimeValue::TimeValue(ns3::TimeValue const & arg0) [constructor] - cls.add_constructor([param('ns3::TimeValue const &', 'arg0')]) - ## nstime.h (module 'core'): ns3::Ptr ns3::TimeValue::Copy() const [member function] - cls.add_method('Copy', - 'ns3::Ptr< ns3::AttributeValue >', - [], - is_const=True, is_virtual=True) - ## nstime.h (module 'core'): bool ns3::TimeValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] - cls.add_method('DeserializeFromString', - 'bool', - [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], - is_virtual=True) - ## nstime.h (module 'core'): ns3::Time ns3::TimeValue::Get() const [member function] - cls.add_method('Get', - 'ns3::Time', - [], - is_const=True) - ## nstime.h (module 'core'): std::string ns3::TimeValue::SerializeToString(ns3::Ptr checker) const [member function] - cls.add_method('SerializeToString', - 'std::string', - [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], - is_const=True, is_virtual=True) - ## nstime.h (module 'core'): void ns3::TimeValue::Set(ns3::Time const & value) [member function] - cls.add_method('Set', - 'void', - [param('ns3::Time const &', 'value')]) - return - def register_Ns3TypeIdChecker_methods(root_module, cls): ## type-id.h (module 'core'): ns3::TypeIdChecker::TypeIdChecker() [constructor] cls.add_constructor([]) @@ -4186,7 +3770,6 @@ def register_functions(root_module): module = root_module register_functions_ns3_FatalImpl(module.add_cpp_namespace('FatalImpl'), root_module) register_functions_ns3_Hash(module.add_cpp_namespace('Hash'), root_module) - register_functions_ns3_TracedValueCallback(module.add_cpp_namespace('TracedValueCallback'), root_module) return def register_functions_ns3_FatalImpl(module, root_module): @@ -4199,9 +3782,6 @@ def register_functions_ns3_Hash(module, root_module): def register_functions_ns3_Hash_Function(module, root_module): return -def register_functions_ns3_TracedValueCallback(module, root_module): - return - def main(): out = FileCodeSink(sys.stdout) root_module = module_init()