rescan bindings
authorHajime Tazaki <tazaki@sfc.wide.ad.jp>
Mon, 13 Jan 2014 20:45:55 +0900
changeset 10567 3734efb57619
parent 10566 9594a4df3bde
child 10568 c2276139e20a
rescan bindings
src/applications/bindings/modulegen__gcc_ILP32.py
src/applications/bindings/modulegen__gcc_LP64.py
src/csma-layout/bindings/modulegen__gcc_ILP32.py
src/csma-layout/bindings/modulegen__gcc_LP64.py
src/csma/bindings/modulegen__gcc_ILP32.py
src/csma/bindings/modulegen__gcc_LP64.py
src/emu/bindings/modulegen__gcc_ILP32.py
src/emu/bindings/modulegen__gcc_LP64.py
src/fd-net-device/bindings/modulegen__gcc_ILP32.py
src/fd-net-device/bindings/modulegen__gcc_LP64.py
src/internet/bindings/modulegen__gcc_ILP32.py
src/internet/bindings/modulegen__gcc_LP64.py
src/lte/bindings/modulegen__gcc_ILP32.py
src/lte/bindings/modulegen__gcc_LP64.py
src/mesh/bindings/modulegen__gcc_ILP32.py
src/mesh/bindings/modulegen__gcc_LP64.py
src/network/bindings/modulegen__gcc_ILP32.py
src/network/bindings/modulegen__gcc_LP64.py
src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py
src/point-to-point-layout/bindings/modulegen__gcc_LP64.py
src/point-to-point/bindings/modulegen__gcc_ILP32.py
src/point-to-point/bindings/modulegen__gcc_LP64.py
src/topology-read/bindings/modulegen__gcc_ILP32.py
src/topology-read/bindings/modulegen__gcc_LP64.py
src/wave/bindings/modulegen__gcc_ILP32.py
src/wave/bindings/modulegen__gcc_LP64.py
src/wifi/bindings/modulegen__gcc_ILP32.py
src/wifi/bindings/modulegen__gcc_LP64.py
src/wimax/bindings/modulegen__gcc_ILP32.py
src/wimax/bindings/modulegen__gcc_LP64.py
--- a/src/applications/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/applications/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4584,16 +4584,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/applications/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/applications/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4584,16 +4584,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/csma-layout/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/csma-layout/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -3971,16 +3971,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/csma-layout/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/csma-layout/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -3971,16 +3971,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/csma/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/csma/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2979,16 +2979,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/csma/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/csma/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2979,16 +2979,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/emu/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/emu/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2834,16 +2834,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/emu/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/emu/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2834,16 +2834,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2884,16 +2884,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/fd-net-device/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/fd-net-device/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2884,16 +2884,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/internet/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/internet/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -7413,16 +7413,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/internet/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/internet/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -7413,16 +7413,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/lte/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/lte/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -19308,8 +19308,6 @@
     return
 
 def register_Ns3LteNetDevice_methods(root_module, cls):
-    ## lte-net-device.h (module 'lte'): ns3::LteNetDevice::m_traceRx [variable]
-    cls.add_instance_attribute('m_traceRx', 'ns3::TracedCallback< ns3::Ptr< ns3::Packet const >, ns3::Mac48Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', is_const=False)
     ## lte-net-device.h (module 'lte'): static ns3::TypeId ns3::LteNetDevice::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -19466,8 +19464,6 @@
     return
 
 def register_Ns3LteUeNetDevice_methods(root_module, cls):
-    ## lte-ue-net-device.h (module 'lte'): ns3::LteUeNetDevice::m_traceTx [variable]
-    cls.add_instance_attribute('m_traceTx', 'ns3::TracedCallback< ns3::Ptr< ns3::Packet const >, ns3::Mac48Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', is_const=False)
     ## lte-ue-net-device.h (module 'lte'): static ns3::TypeId ns3::LteUeNetDevice::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
--- a/src/lte/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/lte/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -19308,8 +19308,6 @@
     return
 
 def register_Ns3LteNetDevice_methods(root_module, cls):
-    ## lte-net-device.h (module 'lte'): ns3::LteNetDevice::m_traceRx [variable]
-    cls.add_instance_attribute('m_traceRx', 'ns3::TracedCallback< ns3::Ptr< ns3::Packet const >, ns3::Mac48Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', is_const=False)
     ## lte-net-device.h (module 'lte'): static ns3::TypeId ns3::LteNetDevice::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -19466,8 +19464,6 @@
     return
 
 def register_Ns3LteUeNetDevice_methods(root_module, cls):
-    ## lte-ue-net-device.h (module 'lte'): ns3::LteUeNetDevice::m_traceTx [variable]
-    cls.add_instance_attribute('m_traceTx', 'ns3::TracedCallback< ns3::Ptr< ns3::Packet const >, ns3::Mac48Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', is_const=False)
     ## lte-ue-net-device.h (module 'lte'): static ns3::TypeId ns3::LteUeNetDevice::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
--- a/src/mesh/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/mesh/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4377,16 +4377,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/mesh/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/mesh/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4377,16 +4377,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/network/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/network/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4145,16 +4145,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/network/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/network/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4145,16 +4145,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -3930,16 +3930,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -3930,16 +3930,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/point-to-point/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/point-to-point/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2890,16 +2890,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/point-to-point/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/point-to-point/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -2890,16 +2890,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/topology-read/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/topology-read/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -102,8 +102,6 @@
     module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     ## attribute.h (module 'core'): ns3::AttributeValue [class]
     module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
-    ## caida-asrel-topology-reader.h (module 'topology-read'): ns3::CaidaAsrelTopologyReader [class]
-    module.add_class('CaidaAsrelTopologyReader', parent=root_module['ns3::TopologyReader'])
     ## callback.h (module 'core'): ns3::CallbackChecker [class]
     module.add_class('CallbackChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## callback.h (module 'core'): ns3::CallbackImplBase [class]
@@ -234,7 +232,6 @@
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
     register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
     register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue'])
-    register_Ns3CaidaAsrelTopologyReader_methods(root_module, root_module['ns3::CaidaAsrelTopologyReader'])
     register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
     register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
     register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
@@ -1928,29 +1925,6 @@
                    is_pure_virtual=True, is_const=True, is_virtual=True)
     return
 
-def register_Ns3CaidaAsrelTopologyReader_methods(root_module, cls):
-    ## caida-asrel-topology-reader.h (module 'topology-read'): static ns3::TypeId ns3::CaidaAsrelTopologyReader::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## caida-asrel-topology-reader.h (module 'topology-read'): ns3::CaidaAsrelTopologyReader::CaidaAsrelTopologyReader() [constructor]
-    cls.add_constructor([])
-    ## caida-asrel-topology-reader.h (module 'topology-read'): ns3::NodeContainer ns3::CaidaAsrelTopologyReader::Read() [member function]
-    cls.add_method('Read', 
-                   'ns3::NodeContainer', 
-                   [], 
-                   is_virtual=True)
-    ## caida-asrel-topology-reader.h (module 'topology-read'): bool ns3::CaidaAsrelTopologyReader::IsStub(ns3::Ptr<ns3::Node> node) [member function]
-    cls.add_method('IsStub', 
-                   'bool', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')])
-    ## caida-asrel-topology-reader.h (module 'topology-read'): uint32_t ns3::CaidaAsrelTopologyReader::GetDepth(ns3::Ptr<ns3::Node> node) [member function]
-    cls.add_method('GetDepth', 
-                   'uint32_t', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')])
-    return
-
 def register_Ns3CallbackChecker_methods(root_module, cls):
     ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker() [constructor]
     cls.add_constructor([])
--- a/src/topology-read/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/topology-read/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -102,8 +102,6 @@
     module.add_class('AttributeChecker', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter<ns3::AttributeChecker> >'])
     ## attribute.h (module 'core'): ns3::AttributeValue [class]
     module.add_class('AttributeValue', allow_subclassing=False, automatic_type_narrowing=True, import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter<ns3::AttributeValue> >'])
-    ## caida-asrel-topology-reader.h (module 'topology-read'): ns3::CaidaAsrelTopologyReader [class]
-    module.add_class('CaidaAsrelTopologyReader', parent=root_module['ns3::TopologyReader'])
     ## callback.h (module 'core'): ns3::CallbackChecker [class]
     module.add_class('CallbackChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
     ## callback.h (module 'core'): ns3::CallbackImplBase [class]
@@ -234,7 +232,6 @@
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
     register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
     register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue'])
-    register_Ns3CaidaAsrelTopologyReader_methods(root_module, root_module['ns3::CaidaAsrelTopologyReader'])
     register_Ns3CallbackChecker_methods(root_module, root_module['ns3::CallbackChecker'])
     register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase'])
     register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue'])
@@ -1928,29 +1925,6 @@
                    is_pure_virtual=True, is_const=True, is_virtual=True)
     return
 
-def register_Ns3CaidaAsrelTopologyReader_methods(root_module, cls):
-    ## caida-asrel-topology-reader.h (module 'topology-read'): static ns3::TypeId ns3::CaidaAsrelTopologyReader::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## caida-asrel-topology-reader.h (module 'topology-read'): ns3::CaidaAsrelTopologyReader::CaidaAsrelTopologyReader() [constructor]
-    cls.add_constructor([])
-    ## caida-asrel-topology-reader.h (module 'topology-read'): ns3::NodeContainer ns3::CaidaAsrelTopologyReader::Read() [member function]
-    cls.add_method('Read', 
-                   'ns3::NodeContainer', 
-                   [], 
-                   is_virtual=True)
-    ## caida-asrel-topology-reader.h (module 'topology-read'): bool ns3::CaidaAsrelTopologyReader::IsStub(ns3::Ptr<ns3::Node> node) [member function]
-    cls.add_method('IsStub', 
-                   'bool', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')])
-    ## caida-asrel-topology-reader.h (module 'topology-read'): uint32_t ns3::CaidaAsrelTopologyReader::GetDepth(ns3::Ptr<ns3::Node> node) [member function]
-    cls.add_method('GetDepth', 
-                   'uint32_t', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')])
-    return
-
 def register_Ns3CallbackChecker_methods(root_module, cls):
     ## callback.h (module 'core'): ns3::CallbackChecker::CallbackChecker() [constructor]
     cls.add_constructor([])
--- a/src/wave/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/wave/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4545,16 +4545,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/wave/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/wave/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -4545,16 +4545,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/wifi/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/wifi/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -5120,16 +5120,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/wifi/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/wifi/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -5120,16 +5120,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/wimax/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/wimax/bindings/modulegen__gcc_ILP32.py	Mon Jan 13 20:45:55 2014 +0900
@@ -5497,16 +5497,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool', 
--- a/src/wimax/bindings/modulegen__gcc_LP64.py	Mon Jan 13 19:04:56 2014 +0900
+++ b/src/wimax/bindings/modulegen__gcc_LP64.py	Mon Jan 13 20:45:55 2014 +0900
@@ -5497,16 +5497,6 @@
                    is_static=True)
     ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper::PcapFileWrapper() [constructor]
     cls.add_constructor([])
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::DoDispose() [member function]
-    cls.add_method('DoDispose', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    ## pcap-file-wrapper.h (module 'network'): void ns3::PcapFileWrapper::NotifyNewAggregate() [member function]
-    cls.add_method('NotifyNewAggregate', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
     ## pcap-file-wrapper.h (module 'network'): bool ns3::PcapFileWrapper::Fail() const [member function]
     cls.add_method('Fail', 
                    'bool',