From 97168ab9158afa6c0aa5ca97cd1dd22914c20d8c Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 16 Feb 2011 12:36:45 +0000 Subject: [PATCH] Python: API rescan --- .../apidefs/gcc-ILP32/callbacks_list.py | 2 +- .../apidefs/gcc-ILP32/ns3_module_contrib.py | 18 --------- .../apidefs/gcc-ILP32/ns3_module_core.py | 2 +- .../apidefs/gcc-ILP32/ns3_module_dot11s.py | 4 +- .../gcc-ILP32/ns3_module_global_routing.py | 2 +- .../apidefs/gcc-ILP32/ns3_module_node.py | 6 +-- .../apidefs/gcc-ILP32/ns3_module_olsr.py | 4 ++ .../apidefs/gcc-ILP32/ns3_module_simulator.py | 38 ++++++++++--------- .../apidefs/gcc-ILP32/ns3_module_stats.py | 20 ---------- .../apidefs/gcc-ILP32/ns3_module_wifi.py | 6 +-- .../python/apidefs/gcc-LP64/callbacks_list.py | 2 +- .../apidefs/gcc-LP64/ns3_module_contrib.py | 18 --------- .../apidefs/gcc-LP64/ns3_module_dot11s.py | 4 +- .../gcc-LP64/ns3_module_global_routing.py | 2 +- .../apidefs/gcc-LP64/ns3_module_node.py | 6 +-- .../apidefs/gcc-LP64/ns3_module_olsr.py | 4 ++ .../apidefs/gcc-LP64/ns3_module_simulator.py | 38 ++++++++++--------- .../apidefs/gcc-LP64/ns3_module_stats.py | 20 ---------- .../apidefs/gcc-LP64/ns3_module_wifi.py | 6 +-- 19 files changed, 69 insertions(+), 133 deletions(-) diff --git a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py index 87ce918db..851219054 100644 --- a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py +++ b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py @@ -1,6 +1,6 @@ callback_classes = [ - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::Address const&', 'unsigned short', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py index a58d25fd8..c71e3b90b 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py @@ -17,8 +17,6 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') - ## gtk-config-store.h: ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -140,7 +138,6 @@ def register_methods(root_module): 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_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -365,21 +362,6 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py index 87e3519ef..71751dbd1 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py @@ -3246,7 +3246,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['long']) + template_parameters=['long long']) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py index f4ce97732..462b76b78 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py @@ -81,6 +81,8 @@ def register_types_ns3_dot11s(module): ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration] module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL']) + ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] + module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration] module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionProtocol [enumeration] @@ -89,8 +91,6 @@ def register_types_ns3_dot11s(module): module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL']) ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration] module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED']) - ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] - module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class] module.add_class('Dot11sMeshCapability') ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class] diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py index 28e931745..2c20a5961 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py @@ -420,7 +420,7 @@ def register_Ns3Ipv4GlobalRouting_methods(root_module, cls): is_const=True) ## ipv4-global-routing.h: ns3::Ipv4RoutingTableEntry * ns3::Ipv4GlobalRouting::GetRoute(uint32_t i) const [member function] cls.add_method('GetRoute', - 'ns3::Ipv4RoutingTableEntry *', + retval('ns3::Ipv4RoutingTableEntry *', caller_owns_return=False), [param('uint32_t', 'i')], is_const=True) ## ipv4-global-routing.h: static ns3::TypeId ns3::Ipv4GlobalRouting::GetTypeId() [member function] diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py index 578337411..55533e6ef 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py @@ -208,12 +208,12 @@ def register_types(module): module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set') module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector') module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') - 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::PhyMacTxEndCallback*') - 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::PhyMacTxEndCallback&') 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::PhyMacRxEndErrorCallback') 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::PhyMacRxEndErrorCallback*') 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::PhyMacRxEndErrorCallback&') + 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::PhyMacTxEndCallback') + 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::PhyMacTxEndCallback*') + 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::PhyMacTxEndCallback&') 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::PhyMacRxEndOkCallback') 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::PhyMacRxEndOkCallback*') 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::PhyMacRxEndOkCallback&') diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py index 8970a9f10..3274d2186 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py @@ -944,6 +944,10 @@ def register_Ns3OlsrRoutingProtocol_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::RemoveHostNetworkAssociation(ns3::Ipv4Address networkAddr, ns3::Ipv4Mask netmask) [member function] + cls.add_method('RemoveHostNetworkAssociation', + 'void', + [param('ns3::Ipv4Address', 'networkAddr'), param('ns3::Ipv4Mask', 'netmask')]) ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::SetInterfaceExclusions(std::set, std::allocator > exceptions) [member function] cls.add_method('SetInterfaceExclusions', 'void', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py index 4a22d9e18..4a6b44419 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py @@ -5,7 +5,7 @@ def register_types(module): ## event-id.h: ns3::EventId [class] module.add_class('EventId') - ## high-precision-double.h: ns3::HighPrecision [class] + ## high-precision-128.h: ns3::HighPrecision [class] module.add_class('HighPrecision') ## simulator.h: ns3::Simulator [class] module.add_class('Simulator', is_singleton=True) @@ -250,65 +250,67 @@ def register_Ns3EventId_methods(root_module, cls): def register_Ns3HighPrecision_methods(root_module, cls): cls.add_output_stream_operator() - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision() [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor] + cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')]) + ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor] cls.add_constructor([]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(double value) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor] cls.add_constructor([param('double', 'value')]) - ## high-precision-double.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] cls.add_method('Add', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] + ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] cls.add_method('Compare', 'int', [param('ns3::HighPrecision const &', 'o')], is_const=True) - ## high-precision-double.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] cls.add_method('Div', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: double ns3::HighPrecision::GetDouble() const [member function] + ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function] cls.add_method('GetDouble', 'double', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetHigh() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function] cls.add_method('GetHigh', 'int64_t', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetInteger() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function] cls.add_method('GetInteger', 'int64_t', [], is_const=True) - ## high-precision-double.h: uint64_t ns3::HighPrecision::GetLow() const [member function] + ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function] cls.add_method('GetLow', 'uint64_t', [], is_const=True) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] cls.add_method('Invert', 'ns3::HighPrecision', [param('uint64_t', 'v')], is_static=True) - ## high-precision-double.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] cls.add_method('Mul', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] cls.add_method('MulByInvert', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] cls.add_method('Sub', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] cls.add_method('Zero', 'ns3::HighPrecision', [], @@ -408,13 +410,13 @@ def register_Ns3Simulator_methods(root_module, cls): def register_Ns3Time_methods(root_module, cls): 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_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('<=') cls.add_binary_comparison_operator('==') 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')) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py index 3f2f24d8e..01bfdf7b9 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py @@ -19,8 +19,6 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) - ## sqlite-data-output.h: ns3::SqliteDataOutput [class] - module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] @@ -133,7 +131,6 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) - register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -478,23 +475,6 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3SqliteDataOutput_methods(root_module, cls): - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] - cls.add_constructor([]) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] - cls.add_method('Output', - 'void', - [param('ns3::DataCollector &', 'dc')], - is_virtual=True) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py index d5c852e97..6f291da57 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py @@ -204,15 +204,15 @@ def register_types(module): ## dca-txop.h: ns3::DcaTxop [class] module.add_class('DcaTxop', parent=root_module['ns3::Dcf']) module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector') - typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator') - typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*') - typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&') typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId') typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*') typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&') + typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator') + typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*') + typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&') diff --git a/bindings/python/apidefs/gcc-LP64/callbacks_list.py b/bindings/python/apidefs/gcc-LP64/callbacks_list.py index c59b68d2a..26509657c 100644 --- a/bindings/python/apidefs/gcc-LP64/callbacks_list.py +++ b/bindings/python/apidefs/gcc-LP64/callbacks_list.py @@ -1,6 +1,6 @@ callback_classes = [ - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::Address const&', 'unsigned short', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py index a58d25fd8..c71e3b90b 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py @@ -17,8 +17,6 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') - ## gtk-config-store.h: ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -140,7 +138,6 @@ def register_methods(root_module): 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_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -365,21 +362,6 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py b/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py index 5e03b8695..c2f271375 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py @@ -81,6 +81,8 @@ def register_types_ns3_dot11s(module): ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration] module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL']) + ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] + module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionProtocol [enumeration] module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration] @@ -89,8 +91,6 @@ def register_types_ns3_dot11s(module): module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL']) ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration] module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED']) - ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] - module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class] module.add_class('Dot11sMeshCapability') ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class] diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py b/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py index 28e931745..2c20a5961 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py @@ -420,7 +420,7 @@ def register_Ns3Ipv4GlobalRouting_methods(root_module, cls): is_const=True) ## ipv4-global-routing.h: ns3::Ipv4RoutingTableEntry * ns3::Ipv4GlobalRouting::GetRoute(uint32_t i) const [member function] cls.add_method('GetRoute', - 'ns3::Ipv4RoutingTableEntry *', + retval('ns3::Ipv4RoutingTableEntry *', caller_owns_return=False), [param('uint32_t', 'i')], is_const=True) ## ipv4-global-routing.h: static ns3::TypeId ns3::Ipv4GlobalRouting::GetTypeId() [member function] diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_node.py b/bindings/python/apidefs/gcc-LP64/ns3_module_node.py index 578337411..55533e6ef 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_node.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_node.py @@ -208,12 +208,12 @@ def register_types(module): module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set') module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector') module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') - 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::PhyMacTxEndCallback*') - 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::PhyMacTxEndCallback&') 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::PhyMacRxEndErrorCallback') 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::PhyMacRxEndErrorCallback*') 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::PhyMacRxEndErrorCallback&') + 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::PhyMacTxEndCallback') + 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::PhyMacTxEndCallback*') + 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::PhyMacTxEndCallback&') 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::PhyMacRxEndOkCallback') 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::PhyMacRxEndOkCallback*') 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::PhyMacRxEndOkCallback&') diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py b/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py index 8970a9f10..3274d2186 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py @@ -944,6 +944,10 @@ def register_Ns3OlsrRoutingProtocol_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::RemoveHostNetworkAssociation(ns3::Ipv4Address networkAddr, ns3::Ipv4Mask netmask) [member function] + cls.add_method('RemoveHostNetworkAssociation', + 'void', + [param('ns3::Ipv4Address', 'networkAddr'), param('ns3::Ipv4Mask', 'netmask')]) ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::SetInterfaceExclusions(std::set, std::allocator > exceptions) [member function] cls.add_method('SetInterfaceExclusions', 'void', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py index 277c1be81..ebe3c2bfa 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py @@ -5,7 +5,7 @@ def register_types(module): ## event-id.h: ns3::EventId [class] module.add_class('EventId') - ## high-precision-double.h: ns3::HighPrecision [class] + ## high-precision-128.h: ns3::HighPrecision [class] module.add_class('HighPrecision') ## simulator.h: ns3::Simulator [class] module.add_class('Simulator', is_singleton=True) @@ -250,65 +250,67 @@ def register_Ns3EventId_methods(root_module, cls): def register_Ns3HighPrecision_methods(root_module, cls): cls.add_output_stream_operator() - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision() [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor] + cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')]) + ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor] cls.add_constructor([]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(double value) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor] cls.add_constructor([param('double', 'value')]) - ## high-precision-double.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] cls.add_method('Add', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] + ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] cls.add_method('Compare', 'int', [param('ns3::HighPrecision const &', 'o')], is_const=True) - ## high-precision-double.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] cls.add_method('Div', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: double ns3::HighPrecision::GetDouble() const [member function] + ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function] cls.add_method('GetDouble', 'double', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetHigh() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function] cls.add_method('GetHigh', 'int64_t', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetInteger() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function] cls.add_method('GetInteger', 'int64_t', [], is_const=True) - ## high-precision-double.h: uint64_t ns3::HighPrecision::GetLow() const [member function] + ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function] cls.add_method('GetLow', 'uint64_t', [], is_const=True) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] cls.add_method('Invert', 'ns3::HighPrecision', [param('uint64_t', 'v')], is_static=True) - ## high-precision-double.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] cls.add_method('Mul', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] cls.add_method('MulByInvert', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] cls.add_method('Sub', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] cls.add_method('Zero', 'ns3::HighPrecision', [], @@ -408,13 +410,13 @@ def register_Ns3Simulator_methods(root_module, cls): def register_Ns3Time_methods(root_module, cls): 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_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('<=') cls.add_binary_comparison_operator('==') 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')) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py index 3f2f24d8e..01bfdf7b9 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py @@ -19,8 +19,6 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) - ## sqlite-data-output.h: ns3::SqliteDataOutput [class] - module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] @@ -133,7 +131,6 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) - register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -478,23 +475,6 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3SqliteDataOutput_methods(root_module, cls): - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] - cls.add_constructor([]) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] - cls.add_method('Output', - 'void', - [param('ns3::DataCollector &', 'dc')], - is_virtual=True) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py index d5c852e97..6f291da57 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py @@ -204,15 +204,15 @@ def register_types(module): ## dca-txop.h: ns3::DcaTxop [class] module.add_class('DcaTxop', parent=root_module['ns3::Dcf']) module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector') - typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator') - typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*') - typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&') typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId') typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*') typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&') + typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator') + typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*') + typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&')