1.1 --- a/bindings/python/ns3_module_core.py	Mon Aug 18 16:00:47 2008 +0100
     1.2 +++ b/bindings/python/ns3_module_core.py	Mon Aug 18 16:02:54 2008 +0100
     1.3 @@ -97,26 +97,6 @@
     1.4      module.add_class('CallbackBase')
     1.5      ## random-variable.h: ns3::ExponentialVariable [class]
     1.6      module.add_class('ExponentialVariable', parent=root_module['ns3::RandomVariable'])
     1.7 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty> [class]
     1.8 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::Packet const>', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty'])
     1.9 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty> [class]
    1.10 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty'])
    1.11 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty> [class]
    1.12 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::Packet const>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty'])
    1.13 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty> [class]
    1.14 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::Packet const>', 'unsigned int', 'ns3::empty', 'ns3::empty'])
    1.15 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty> [class]
    1.16 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::MobilityModel const>', 'ns3::empty', 'ns3::empty', 'ns3::empty'])
    1.17 -    ## traced-callback.h: ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty> [class]
    1.18 -    module.add_class('TracedCallback', template_parameters=['ns3::TimeUnit<1>', 'ns3::TimeUnit<1>', 'ns3::WifiPhy::State', 'ns3::empty'])
    1.19 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char> [class]
    1.20 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::Packet const>', 'ns3::WifiMode', 'ns3::WifiPreamble', 'unsigned char'])
    1.21 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty> [class]
    1.22 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::Packet const>', 'double', 'ns3::empty', 'ns3::empty'])
    1.23 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble> [class]
    1.24 -    module.add_class('TracedCallback', template_parameters=['ns3::Ptr<ns3::Packet const>', 'double', 'ns3::WifiMode', 'ns3::WifiPreamble'])
    1.25 -    ## traced-callback.h: ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty> [class]
    1.26 -    module.add_class('TracedCallback', template_parameters=['unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty'])
    1.27      ## random-variable.h: ns3::DeterministicVariable [class]
    1.28      module.add_class('DeterministicVariable', parent=root_module['ns3::RandomVariable'])
    1.29      ## attribute-list.h: ns3::AttributeList [class]
    1.30 @@ -259,16 +239,6 @@
    1.31      register_Ns3WeibullVariable_methods(root_module, root_module['ns3::WeibullVariable'])
    1.32      register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
    1.33      register_Ns3ExponentialVariable_methods(root_module, root_module['ns3::ExponentialVariable'])
    1.34 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Mac48Address_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty >'])
    1.35 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty >'])
    1.36 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Address_const__amp___Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty >'])
    1.37 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty >'])
    1.38 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3MobilityModel_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty >'])
    1.39 -    register_Ns3TracedCallback__Ns3TimeUnit__lt__1__gt___Ns3TimeUnit__lt__1__gt___Ns3WifiPhyState_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty >'])
    1.40 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3WifiMode_Ns3WifiPreamble_Unsigned_char_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char >'])
    1.41 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty >'])
    1.42 -    register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3WifiMode_Ns3WifiPreamble_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble >'])
    1.43 -    register_Ns3TracedCallback__Unsigned_int_Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< unsigned int, unsigned int, ns3::empty, ns3::empty >'])
    1.44      register_Ns3DeterministicVariable_methods(root_module, root_module['ns3::DeterministicVariable'])
    1.45      register_Ns3AttributeList_methods(root_module, root_module['ns3::AttributeList'])
    1.46      register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue'])
    1.47 @@ -1114,216 +1084,6 @@
    1.48                     is_static=True)
    1.49      return
    1.50  
    1.51 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Mac48Address_Ns3Empty_Ns3Empty_methods(root_module, cls):
    1.52 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::TracedCallback() [constructor]
    1.53 -    cls.add_constructor([])
    1.54 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
    1.55 -    cls.add_method('ConnectWithoutContext', 
    1.56 -                   'void', 
    1.57 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
    1.58 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
    1.59 -    cls.add_method('Connect', 
    1.60 -                   'void', 
    1.61 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
    1.62 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
    1.63 -    cls.add_method('DisconnectWithoutContext', 
    1.64 -                   'void', 
    1.65 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
    1.66 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Mac48Address, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
    1.67 -    cls.add_method('Disconnect', 
    1.68 -                   'void', 
    1.69 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
    1.70 -    return
    1.71 -
    1.72 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, cls):
    1.73 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::TracedCallback() [constructor]
    1.74 -    cls.add_constructor([])
    1.75 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
    1.76 -    cls.add_method('ConnectWithoutContext', 
    1.77 -                   'void', 
    1.78 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
    1.79 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
    1.80 -    cls.add_method('Connect', 
    1.81 -                   'void', 
    1.82 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
    1.83 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
    1.84 -    cls.add_method('DisconnectWithoutContext', 
    1.85 -                   'void', 
    1.86 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
    1.87 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::empty, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
    1.88 -    cls.add_method('Disconnect', 
    1.89 -                   'void', 
    1.90 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
    1.91 -    return
    1.92 -
    1.93 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Address_const__amp___Ns3Empty_Ns3Empty_methods(root_module, cls):
    1.94 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::TracedCallback() [constructor]
    1.95 -    cls.add_constructor([])
    1.96 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
    1.97 -    cls.add_method('ConnectWithoutContext', 
    1.98 -                   'void', 
    1.99 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.100 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.101 -    cls.add_method('Connect', 
   1.102 -                   'void', 
   1.103 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.104 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.105 -    cls.add_method('DisconnectWithoutContext', 
   1.106 -                   'void', 
   1.107 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.108 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::Address const&, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.109 -    cls.add_method('Disconnect', 
   1.110 -                   'void', 
   1.111 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.112 -    return
   1.113 -
   1.114 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, cls):
   1.115 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::TracedCallback() [constructor]
   1.116 -    cls.add_constructor([])
   1.117 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.118 -    cls.add_method('ConnectWithoutContext', 
   1.119 -                   'void', 
   1.120 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.121 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.122 -    cls.add_method('Connect', 
   1.123 -                   'void', 
   1.124 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.125 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.126 -    cls.add_method('DisconnectWithoutContext', 
   1.127 -                   'void', 
   1.128 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.129 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, unsigned int, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.130 -    cls.add_method('Disconnect', 
   1.131 -                   'void', 
   1.132 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.133 -    return
   1.134 -
   1.135 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3MobilityModel_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, cls):
   1.136 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::TracedCallback() [constructor]
   1.137 -    cls.add_constructor([])
   1.138 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.139 -    cls.add_method('ConnectWithoutContext', 
   1.140 -                   'void', 
   1.141 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.142 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.143 -    cls.add_method('Connect', 
   1.144 -                   'void', 
   1.145 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.146 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.147 -    cls.add_method('DisconnectWithoutContext', 
   1.148 -                   'void', 
   1.149 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.150 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::MobilityModel const>, ns3::empty, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.151 -    cls.add_method('Disconnect', 
   1.152 -                   'void', 
   1.153 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.154 -    return
   1.155 -
   1.156 -def register_Ns3TracedCallback__Ns3TimeUnit__lt__1__gt___Ns3TimeUnit__lt__1__gt___Ns3WifiPhyState_Ns3Empty_methods(root_module, cls):
   1.157 -    ## traced-callback.h: ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::TracedCallback() [constructor]
   1.158 -    cls.add_constructor([])
   1.159 -    ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.160 -    cls.add_method('ConnectWithoutContext', 
   1.161 -                   'void', 
   1.162 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.163 -    ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.164 -    cls.add_method('Connect', 
   1.165 -                   'void', 
   1.166 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.167 -    ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.168 -    cls.add_method('DisconnectWithoutContext', 
   1.169 -                   'void', 
   1.170 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.171 -    ## traced-callback.h: void ns3::TracedCallback<ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.172 -    cls.add_method('Disconnect', 
   1.173 -                   'void', 
   1.174 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.175 -    return
   1.176 -
   1.177 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3WifiMode_Ns3WifiPreamble_Unsigned_char_methods(root_module, cls):
   1.178 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::TracedCallback() [constructor]
   1.179 -    cls.add_constructor([])
   1.180 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.181 -    cls.add_method('ConnectWithoutContext', 
   1.182 -                   'void', 
   1.183 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.184 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.185 -    cls.add_method('Connect', 
   1.186 -                   'void', 
   1.187 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.188 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.189 -    cls.add_method('DisconnectWithoutContext', 
   1.190 -                   'void', 
   1.191 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.192 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.193 -    cls.add_method('Disconnect', 
   1.194 -                   'void', 
   1.195 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.196 -    return
   1.197 -
   1.198 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3Empty_Ns3Empty_methods(root_module, cls):
   1.199 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::TracedCallback() [constructor]
   1.200 -    cls.add_constructor([])
   1.201 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.202 -    cls.add_method('ConnectWithoutContext', 
   1.203 -                   'void', 
   1.204 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.205 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.206 -    cls.add_method('Connect', 
   1.207 -                   'void', 
   1.208 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.209 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.210 -    cls.add_method('DisconnectWithoutContext', 
   1.211 -                   'void', 
   1.212 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.213 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.214 -    cls.add_method('Disconnect', 
   1.215 -                   'void', 
   1.216 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.217 -    return
   1.218 -
   1.219 -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3WifiMode_Ns3WifiPreamble_methods(root_module, cls):
   1.220 -    ## traced-callback.h: ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::TracedCallback() [constructor]
   1.221 -    cls.add_constructor([])
   1.222 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.223 -    cls.add_method('ConnectWithoutContext', 
   1.224 -                   'void', 
   1.225 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.226 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.227 -    cls.add_method('Connect', 
   1.228 -                   'void', 
   1.229 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.230 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.231 -    cls.add_method('DisconnectWithoutContext', 
   1.232 -                   'void', 
   1.233 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.234 -    ## traced-callback.h: void ns3::TracedCallback<ns3::Ptr<ns3::Packet const>, double, ns3::WifiMode, ns3::WifiPreamble>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.235 -    cls.add_method('Disconnect', 
   1.236 -                   'void', 
   1.237 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.238 -    return
   1.239 -
   1.240 -def register_Ns3TracedCallback__Unsigned_int_Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, cls):
   1.241 -    ## traced-callback.h: ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::TracedCallback() [constructor]
   1.242 -    cls.add_constructor([])
   1.243 -    ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.244 -    cls.add_method('ConnectWithoutContext', 
   1.245 -                   'void', 
   1.246 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.247 -    ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.248 -    cls.add_method('Connect', 
   1.249 -                   'void', 
   1.250 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.251 -    ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function]
   1.252 -    cls.add_method('DisconnectWithoutContext', 
   1.253 -                   'void', 
   1.254 -                   [param('ns3::CallbackBase&', 'callback', is_const=True)])
   1.255 -    ## traced-callback.h: void ns3::TracedCallback<unsigned int, unsigned int, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function]
   1.256 -    cls.add_method('Disconnect', 
   1.257 -                   'void', 
   1.258 -                   [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')])
   1.259 -    return
   1.260 -
   1.261  def register_Ns3DeterministicVariable_methods(root_module, cls):
   1.262      ## random-variable.h: ns3::DeterministicVariable::DeterministicVariable(double * d, uint32_t c) [constructor]
   1.263      cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')])

     2.1 --- a/bindings/python/ns3_module_helper.py	Mon Aug 18 16:00:47 2008 +0100
     2.2 +++ b/bindings/python/ns3_module_helper.py	Mon Aug 18 16:02:54 2008 +0100
     2.3 @@ -35,6 +35,8 @@
     2.4      module.add_class('WifiHelper', allow_subclassing=False)
     2.5      ## ipv4-address-helper.h: ns3::Ipv4AddressHelper [class]
     2.6      module.add_class('Ipv4AddressHelper', allow_subclassing=False)
     2.7 +    ## bridge-helper.h: ns3::BridgeHelper [class]
     2.8 +    module.add_class('BridgeHelper', allow_subclassing=False)
     2.9      ## packet-sink-helper.h: ns3::PacketSinkHelper [class]
    2.10      module.add_class('PacketSinkHelper', allow_subclassing=False)
    2.11      ## ns2-mobility-helper.h: ns3::Ns2MobilityHelper [class]
    2.12 @@ -97,6 +99,7 @@
    2.13      register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer'])
    2.14      register_Ns3WifiHelper_methods(root_module, root_module['ns3::WifiHelper'])
    2.15      register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper'])
    2.16 +    register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper'])
    2.17      register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper'])
    2.18      register_Ns3Ns2MobilityHelper_methods(root_module, root_module['ns3::Ns2MobilityHelper'])
    2.19      return
    2.20 @@ -635,6 +638,19 @@
    2.21                     [param('ns3::NetDeviceContainer&', 'c', is_const=True)])
    2.22      return
    2.23  
    2.24 +def register_Ns3BridgeHelper_methods(root_module, cls):
    2.25 +    ## bridge-helper.h: ns3::BridgeHelper::BridgeHelper() [constructor]
    2.26 +    cls.add_constructor([])
    2.27 +    ## bridge-helper.h: void ns3::BridgeHelper::SetDeviceAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
    2.28 +    cls.add_method('SetDeviceAttribute', 
    2.29 +                   'void', 
    2.30 +                   [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)])
    2.31 +    ## bridge-helper.h: ns3::NetDeviceContainer ns3::BridgeHelper::Install(ns3::Ptr<ns3::Node> node, ns3::NetDeviceContainer c) [member function]
    2.32 +    cls.add_method('Install', 
    2.33 +                   'ns3::NetDeviceContainer', 
    2.34 +                   [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::NetDeviceContainer', 'c')])
    2.35 +    return
    2.36 +
    2.37  def register_Ns3PacketSinkHelper_methods(root_module, cls):
    2.38      ## packet-sink-helper.h: ns3::PacketSinkHelper::PacketSinkHelper(std::string protocol, ns3::Address address) [constructor]
    2.39      cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')])

     3.1 --- a/bindings/python/ns3_module_node.py	Mon Aug 18 16:00:47 2008 +0100
     3.2 +++ b/bindings/python/ns3_module_node.py	Mon Aug 18 16:02:54 2008 +0100
     3.3 @@ -1029,7 +1029,7 @@
     3.4                     [])
     3.5      ## queue.h: ns3::Ptr<const ns3::Packet> ns3::Queue::Peek() const [member function]
     3.6      cls.add_method('Peek', 
     3.7 -                   'ns3::Ptr<const ns3::Packet >', 
     3.8 +                   'ns3::Ptr< const ns3::Packet >', 
     3.9                     [], 
    3.10                     is_const=True)
    3.11      ## queue.h: void ns3::Queue::DequeueAll() [member function]
    3.12 @@ -1087,7 +1087,7 @@
    3.13                     is_pure_virtual=True, visibility='private', is_virtual=True)
    3.14      ## queue.h: ns3::Ptr<const ns3::Packet> ns3::Queue::DoPeek() const [member function]
    3.15      cls.add_method('DoPeek', 
    3.16 -                   'ns3::Ptr<const ns3::Packet >', 
    3.17 +                   'ns3::Ptr< const ns3::Packet >', 
    3.18                     [], 
    3.19                     is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
    3.20      return
    3.21 @@ -1121,8 +1121,7 @@
    3.22      ## socket.h: bool ns3::Socket::SetDataSentCallback(ns3::Callback<void, ns3::Ptr<ns3::Socket>, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty> dataSent) [member function]
    3.23      cls.add_method('SetDataSentCallback', 
    3.24                     'bool', 
    3.25 -                   [param('ns3::Callback< void, ns3::Ptr< ns3::Socket >, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'dataSent')], 
    3.26 -                   is_virtual=True)
    3.27 +                   [param('ns3::Callback< void, ns3::Ptr< ns3::Socket >, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'dataSent')])
    3.28      ## socket.h: void ns3::Socket::SetSendCallback(ns3::Callback<void, ns3::Ptr<ns3::Socket>, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty> sendCb) [member function]
    3.29      cls.add_method('SetSendCallback', 
    3.30                     'void', 
    3.31 @@ -1592,7 +1591,7 @@
    3.32                     visibility='private', is_virtual=True)
    3.33      ## drop-tail-queue.h: ns3::Ptr<const ns3::Packet> ns3::DropTailQueue::DoPeek() const [member function]
    3.34      cls.add_method('DoPeek', 
    3.35 -                   'ns3::Ptr<const ns3::Packet >', 
    3.36 +                   'ns3::Ptr< const ns3::Packet >', 
    3.37                     [], 
    3.38                     is_const=True, visibility='private', is_virtual=True)
    3.39      return

     4.1 --- a/bindings/python/ns3modulegen_generated.py	Mon Aug 18 16:00:47 2008 +0100
     4.2 +++ b/bindings/python/ns3modulegen_generated.py	Mon Aug 18 16:02:54 2008 +0100
     4.3 @@ -224,6 +224,8 @@
     4.4          ns3_module_helper__local.register_types(module)
     4.5      
     4.6      root_module.end_section('ns3_module_helper')
     4.7 +    module.add_container('std::vector< unsigned int, std::allocator< unsigned int > >', 'unsigned int')
     4.8 +    module.add_container('std::list< unsigned int, std::allocator< unsigned int > >', 'unsigned int')
     4.9      
    4.10      ## Register a nested module for the namespace internal
    4.11