# HG changeset patch
# User Craig Dowell <craigdo@ee.washington.edu>
# Date 1267034413 28800
# Node ID 18ed08fb4c4a9f491e7d6cf7bb07056c1ee49e70
# Parent  8b1b404f433564743277d278cd71bf7629d3fca5
Remove GetTypeId and rescan

diff -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py	Wed Feb 24 10:00:13 2010 -0800
@@ -387,6 +387,11 @@
                    '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 @@
                    '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 @@
                    '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 @@
                    '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 @@
                    '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 -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-ILP32/ns3_module_common.py
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py	Wed Feb 24 10:00:13 2010 -0800
@@ -1566,11 +1566,6 @@
     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 -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py	Wed Feb 24 10:00:13 2010 -0800
@@ -1498,10 +1498,10 @@
     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::Node> ns3::PointToPointDumbbellHelper::GetLeft() const [member function]
     cls.add_method('GetLeft', 
                    'ns3::Ptr< ns3::Node >', 
diff -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py	Wed Feb 24 10:00:13 2010 -0800
@@ -110,10 +110,10 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr<ns3::Node> arg0) [member function]
+    ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr<ns3::Node> 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 -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py	Wed Feb 24 10:00:13 2010 -0800
@@ -387,6 +387,11 @@
                    '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 @@
                    '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 @@
                    '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 @@
                    '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 @@
                    '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 -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-LP64/ns3_module_common.py
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py	Wed Feb 24 10:00:13 2010 -0800
@@ -1566,11 +1566,6 @@
     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 -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-LP64/ns3_module_helper.py
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py	Wed Feb 24 10:00:13 2010 -0800
@@ -1498,10 +1498,10 @@
     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::Node> ns3::PointToPointDumbbellHelper::GetLeft() const [member function]
     cls.add_method('GetLeft', 
                    'ns3::Ptr< ns3::Node >', 
diff -r 8b1b404f4335 -r 18ed08fb4c4a bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py	Tue Feb 23 12:18:35 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py	Wed Feb 24 10:00:13 2010 -0800
@@ -110,10 +110,10 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr<ns3::Node> arg0) [member function]
+    ## ipv4-nix-vector-routing.h: void ns3::Ipv4NixVectorRouting::SetNode(ns3::Ptr<ns3::Node> 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 -r 8b1b404f4335 -r 18ed08fb4c4a src/common/output-stream-wrapper.h
--- a/src/common/output-stream-wrapper.h	Tue Feb 23 12:18:35 2010 -0800
+++ b/src/common/output-stream-wrapper.h	Wed Feb 24 10:00:13 2010 -0800
@@ -73,8 +73,6 @@
 class OutputStreamWrapper : public SimpleRefCount<OutputStreamWrapper>
 {
 public:
-  static TypeId GetTypeId (void);
-
   OutputStreamWrapper ();
   ~OutputStreamWrapper ();