From ab2edebda3ca0adccfb29b9f0465c83d6efb8ec0 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Wed, 24 Feb 2010 10:00:13 -0800 Subject: [PATCH] Remove GetTypeId and rescan --- .../apidefs/gcc-ILP32/ns3_module_aodv.py | 25 +++++++++++++++++++ .../apidefs/gcc-ILP32/ns3_module_common.py | 5 ---- .../apidefs/gcc-ILP32/ns3_module_helper.py | 4 +-- .../ns3_module_nix_vector_routing.py | 4 +-- .../apidefs/gcc-LP64/ns3_module_aodv.py | 25 +++++++++++++++++++ .../apidefs/gcc-LP64/ns3_module_common.py | 5 ---- .../apidefs/gcc-LP64/ns3_module_helper.py | 4 +-- .../gcc-LP64/ns3_module_nix_vector_routing.py | 4 +-- src/common/output-stream-wrapper.h | 2 -- 9 files changed, 58 insertions(+), 20 deletions(-) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py index 72a07fbba..6e192ecda 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py @@ -387,6 +387,11 @@ def register_Ns3AodvRerrHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RerrHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: void ns3::aodv::RerrHeader::Print(std::ostream & os) const [member function] cls.add_method('Print', 'void', @@ -744,6 +749,11 @@ def register_Ns3AodvRrepAckHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RrepAckHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: void ns3::aodv::RrepAckHeader::Print(std::ostream & os) const [member function] cls.add_method('Print', 'void', @@ -813,6 +823,11 @@ def register_Ns3AodvRrepHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RrepHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: void ns3::aodv::RrepHeader::Print(std::ostream & os) const [member function] cls.add_method('Print', 'void', @@ -919,6 +934,11 @@ def register_Ns3AodvRreqHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RreqHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: bool ns3::aodv::RreqHeader::GetUnknownSeqno() const [member function] cls.add_method('GetUnknownSeqno', 'bool', @@ -999,6 +1019,11 @@ def register_Ns3AodvTypeHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::TypeHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: bool ns3::aodv::TypeHeader::IsValid() const [member function] cls.add_method('IsValid', 'bool', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py index 90f95980d..6ec9894f1 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py @@ -1566,11 +1566,6 @@ def register_Ns3OutputStreamWrapper_methods(root_module, cls): cls.add_method('GetStream', 'std::ostream *', []) - ## output-stream-wrapper.h: static ns3::TypeId ns3::OutputStreamWrapper::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## output-stream-wrapper.h: void ns3::OutputStreamWrapper::SetStream(std::ostream * ostream) [member function] cls.add_method('SetStream', 'void', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py index 293a2915f..4f17a4758 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py @@ -1498,10 +1498,10 @@ def register_Ns3PointToPointDumbbellHelper_methods(root_module, cls): cls.add_method('AssignIpv4Addresses', 'void', [param('ns3::Ipv4AddressHelper', 'leftIp'), param('ns3::Ipv4AddressHelper', 'rightIp'), param('ns3::Ipv4AddressHelper', 'routerIp')]) - ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function] + ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double ulx, double uly, double lrx, double lry) [member function] cls.add_method('BoundingBox', 'void', - [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')]) + [param('double', 'ulx'), param('double', 'uly'), param('double', 'lrx'), param('double', 'lry')]) ## point-to-point-dumbbell-helper.h: ns3::Ptr ns3::PointToPointDumbbellHelper::GetLeft() const [member function] cls.add_method('GetLeft', 'ns3::Ptr< ns3::Node >', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py index 990967728..00166891b 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py @@ -110,10 +110,10 @@ def register_Ns3Ipv4NixVectorRouting_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) - ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr arg0) [member function] + ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr node) [member function] cls.add_method('SetNode', 'void', - [param('ns3::Ptr< ns3::Node >', 'arg0')]) + [param('ns3::Ptr< ns3::Node >', 'node')]) ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::DoDispose() [member function] cls.add_method('DoDispose', 'void', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py b/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py index 72a07fbba..6e192ecda 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py @@ -387,6 +387,11 @@ def register_Ns3AodvRerrHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RerrHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: void ns3::aodv::RerrHeader::Print(std::ostream & os) const [member function] cls.add_method('Print', 'void', @@ -744,6 +749,11 @@ def register_Ns3AodvRrepAckHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RrepAckHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: void ns3::aodv::RrepAckHeader::Print(std::ostream & os) const [member function] cls.add_method('Print', 'void', @@ -813,6 +823,11 @@ def register_Ns3AodvRrepHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RrepHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: void ns3::aodv::RrepHeader::Print(std::ostream & os) const [member function] cls.add_method('Print', 'void', @@ -919,6 +934,11 @@ def register_Ns3AodvRreqHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::RreqHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: bool ns3::aodv::RreqHeader::GetUnknownSeqno() const [member function] cls.add_method('GetUnknownSeqno', 'bool', @@ -999,6 +1019,11 @@ def register_Ns3AodvTypeHeader_methods(root_module, cls): 'uint32_t', [], is_const=True, is_virtual=True) + ## aodv-packet.h: static ns3::TypeId ns3::aodv::TypeHeader::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## aodv-packet.h: bool ns3::aodv::TypeHeader::IsValid() const [member function] cls.add_method('IsValid', 'bool', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py index 90f95980d..6ec9894f1 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py @@ -1566,11 +1566,6 @@ def register_Ns3OutputStreamWrapper_methods(root_module, cls): cls.add_method('GetStream', 'std::ostream *', []) - ## output-stream-wrapper.h: static ns3::TypeId ns3::OutputStreamWrapper::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## output-stream-wrapper.h: void ns3::OutputStreamWrapper::SetStream(std::ostream * ostream) [member function] cls.add_method('SetStream', 'void', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py index 293a2915f..4f17a4758 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py @@ -1498,10 +1498,10 @@ def register_Ns3PointToPointDumbbellHelper_methods(root_module, cls): cls.add_method('AssignIpv4Addresses', 'void', [param('ns3::Ipv4AddressHelper', 'leftIp'), param('ns3::Ipv4AddressHelper', 'rightIp'), param('ns3::Ipv4AddressHelper', 'routerIp')]) - ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function] + ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double ulx, double uly, double lrx, double lry) [member function] cls.add_method('BoundingBox', 'void', - [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')]) + [param('double', 'ulx'), param('double', 'uly'), param('double', 'lrx'), param('double', 'lry')]) ## point-to-point-dumbbell-helper.h: ns3::Ptr ns3::PointToPointDumbbellHelper::GetLeft() const [member function] cls.add_method('GetLeft', 'ns3::Ptr< ns3::Node >', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py b/bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py index 990967728..00166891b 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py @@ -110,10 +110,10 @@ def register_Ns3Ipv4NixVectorRouting_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) - ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr arg0) [member function] + ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr node) [member function] cls.add_method('SetNode', 'void', - [param('ns3::Ptr< ns3::Node >', 'arg0')]) + [param('ns3::Ptr< ns3::Node >', 'node')]) ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::DoDispose() [member function] cls.add_method('DoDispose', 'void', diff --git a/src/common/output-stream-wrapper.h b/src/common/output-stream-wrapper.h index 02293fe1c..d99b0ac45 100644 --- a/src/common/output-stream-wrapper.h +++ b/src/common/output-stream-wrapper.h @@ -73,8 +73,6 @@ namespace ns3 { class OutputStreamWrapper : public SimpleRefCount { public: - static TypeId GetTypeId (void); - OutputStreamWrapper (); ~OutputStreamWrapper ();