1.1 --- a/bindings/python/ns3_module_bridge.py	Thu May 21 06:03:42 2009 -0700
     1.2 +++ b/bindings/python/ns3_module_bridge.py	Thu May 21 06:04:40 2009 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     1.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     1.6  
     1.7  def register_types(module):
     1.8      root_module = module.get_root()

     2.1 --- a/bindings/python/ns3_module_common.py	Thu May 21 06:03:42 2009 -0700
     2.2 +++ b/bindings/python/ns3_module_common.py	Thu May 21 06:04:40 2009 -0700
     2.3 @@ -1,4 +1,4 @@
     2.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     2.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     2.6  
     2.7  def register_types(module):
     2.8      root_module = module.get_root()

     3.1 --- a/bindings/python/ns3_module_contrib.py	Thu May 21 06:03:42 2009 -0700
     3.2 +++ b/bindings/python/ns3_module_contrib.py	Thu May 21 06:04:40 2009 -0700
     3.3 @@ -1,4 +1,4 @@
     3.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     3.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     3.6  
     3.7  def register_types(module):
     3.8      root_module = module.get_root()

     4.1 --- a/bindings/python/ns3_module_core.py	Thu May 21 06:03:42 2009 -0700
     4.2 +++ b/bindings/python/ns3_module_core.py	Thu May 21 06:04:40 2009 -0700
     4.3 @@ -1,4 +1,4 @@
     4.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     4.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     4.6  
     4.7  def register_types(module):
     4.8      root_module = module.get_root()
     4.9 @@ -2028,7 +2028,7 @@
    4.10      cls.add_method('ConnectWithoutContext', 
    4.11                     'void', 
    4.12                     [param('ns3::CallbackBase const &', 'cb')])
    4.13 -    ## traced-value.h: void ns3::TracedValue<unsigned int>::Connect(ns3::CallbackBase const & cb, std::string path) [member function]
    4.14 +    ## traced-value.h: void ns3::TracedValue<unsigned int>::Connect(ns3::CallbackBase const & cb, std::basic_string<char,std::char_traits<char>,std::allocator<char> > path) [member function]
    4.15      cls.add_method('Connect', 
    4.16                     'void', 
    4.17                     [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])
    4.18 @@ -2036,7 +2036,7 @@
    4.19      cls.add_method('DisconnectWithoutContext', 
    4.20                     'void', 
    4.21                     [param('ns3::CallbackBase const &', 'cb')])
    4.22 -    ## traced-value.h: void ns3::TracedValue<unsigned int>::Disconnect(ns3::CallbackBase const & cb, std::string path) [member function]
    4.23 +    ## traced-value.h: void ns3::TracedValue<unsigned int>::Disconnect(ns3::CallbackBase const & cb, std::basic_string<char,std::char_traits<char>,std::allocator<char> > path) [member function]
    4.24      cls.add_method('Disconnect', 
    4.25                     'void', 
    4.26                     [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')])
    4.27 @@ -2184,7 +2184,7 @@
    4.28      module.add_function('TypeNameGet', 
    4.29                          'std::string', 
    4.30                          [], 
    4.31 -                        template_parameters=['long long'])
    4.32 +                        template_parameters=['long'])
    4.33      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
    4.34      module.add_function('TypeNameGet', 
    4.35                          'std::string', 
    4.36 @@ -2204,7 +2204,7 @@
    4.37      module.add_function('TypeNameGet', 
    4.38                          'std::string', 
    4.39                          [], 
    4.40 -                        template_parameters=['unsigned long long'])
    4.41 +                        template_parameters=['unsigned long'])
    4.42      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
    4.43      module.add_function('TypeNameGet', 
    4.44                          'std::string', 

     5.1 --- a/bindings/python/ns3_module_csma.py	Thu May 21 06:03:42 2009 -0700
     5.2 +++ b/bindings/python/ns3_module_csma.py	Thu May 21 06:04:40 2009 -0700
     5.3 @@ -1,4 +1,4 @@
     5.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     5.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     5.6  
     5.7  def register_types(module):
     5.8      root_module = module.get_root()

     6.1 --- a/bindings/python/ns3_module_emu.py	Thu May 21 06:03:42 2009 -0700
     6.2 +++ b/bindings/python/ns3_module_emu.py	Thu May 21 06:04:40 2009 -0700
     6.3 @@ -1,4 +1,4 @@
     6.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     6.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     6.6  
     6.7  def register_types(module):
     6.8      root_module = module.get_root()

     7.1 --- a/bindings/python/ns3_module_global_routing.py	Thu May 21 06:03:42 2009 -0700
     7.2 +++ b/bindings/python/ns3_module_global_routing.py	Thu May 21 06:04:40 2009 -0700
     7.3 @@ -1,4 +1,4 @@
     7.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     7.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     7.6  
     7.7  def register_types(module):
     7.8      root_module = module.get_root()

     8.1 --- a/bindings/python/ns3_module_helper.py	Thu May 21 06:03:42 2009 -0700
     8.2 +++ b/bindings/python/ns3_module_helper.py	Thu May 21 06:04:40 2009 -0700
     8.3 @@ -1,4 +1,4 @@
     8.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     8.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     8.6  
     8.7  def register_types(module):
     8.8      root_module = module.get_root()

     9.1 --- a/bindings/python/ns3_module_internet_stack.py	Thu May 21 06:03:42 2009 -0700
     9.2 +++ b/bindings/python/ns3_module_internet_stack.py	Thu May 21 06:04:40 2009 -0700
     9.3 @@ -1,4 +1,4 @@
     9.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     9.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     9.6  
     9.7  def register_types(module):
     9.8      root_module = module.get_root()

    10.1 --- a/bindings/python/ns3_module_mobility.py	Thu May 21 06:03:42 2009 -0700
    10.2 +++ b/bindings/python/ns3_module_mobility.py	Thu May 21 06:04:40 2009 -0700
    10.3 @@ -1,4 +1,4 @@
    10.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    10.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    10.6  
    10.7  def register_types(module):
    10.8      root_module = module.get_root()

    11.1 --- a/bindings/python/ns3_module_node.py	Thu May 21 06:03:42 2009 -0700
    11.2 +++ b/bindings/python/ns3_module_node.py	Thu May 21 06:04:40 2009 -0700
    11.3 @@ -1,4 +1,4 @@
    11.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    11.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    11.6  
    11.7  def register_types(module):
    11.8      root_module = module.get_root()

    12.1 --- a/bindings/python/ns3_module_olsr.py	Thu May 21 06:03:42 2009 -0700
    12.2 +++ b/bindings/python/ns3_module_olsr.py	Thu May 21 06:04:40 2009 -0700
    12.3 @@ -1,4 +1,4 @@
    12.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    12.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    12.6  
    12.7  def register_types(module):
    12.8      root_module = module.get_root()
    12.9 @@ -91,15 +91,6 @@
   12.10      module.add_class('TwoHopNeighborTuple')
   12.11      module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector')
   12.12      module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector')
   12.13 -    typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet')
   12.14 -    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
   12.15 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
   12.16 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
   12.17 -    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
   12.18 -    typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet')
   12.19 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
   12.20 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
   12.21 -    typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet')
   12.22  
   12.23  def register_methods(root_module):
   12.24      register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState'])

    13.1 --- a/bindings/python/ns3_module_onoff.py	Thu May 21 06:03:42 2009 -0700
    13.2 +++ b/bindings/python/ns3_module_onoff.py	Thu May 21 06:04:40 2009 -0700
    13.3 @@ -1,4 +1,4 @@
    13.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    13.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    13.6  
    13.7  def register_types(module):
    13.8      root_module = module.get_root()

    14.1 --- a/bindings/python/ns3_module_packet_sink.py	Thu May 21 06:03:42 2009 -0700
    14.2 +++ b/bindings/python/ns3_module_packet_sink.py	Thu May 21 06:04:40 2009 -0700
    14.3 @@ -1,4 +1,4 @@
    14.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    14.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    14.6  
    14.7  def register_types(module):
    14.8      root_module = module.get_root()

    15.1 --- a/bindings/python/ns3_module_point_to_point.py	Thu May 21 06:03:42 2009 -0700
    15.2 +++ b/bindings/python/ns3_module_point_to_point.py	Thu May 21 06:04:40 2009 -0700
    15.3 @@ -1,4 +1,4 @@
    15.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    15.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    15.6  
    15.7  def register_types(module):
    15.8      root_module = module.get_root()

    16.1 --- a/bindings/python/ns3_module_simulator.py	Thu May 21 06:03:42 2009 -0700
    16.2 +++ b/bindings/python/ns3_module_simulator.py	Thu May 21 06:04:40 2009 -0700
    16.3 @@ -1,4 +1,4 @@
    16.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    16.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    16.6  
    16.7  def register_types(module):
    16.8      root_module = module.get_root()
    16.9 @@ -61,10 +61,6 @@
   16.10      module.add_class('RealtimeSimulatorImpl', parent=root_module['ns3::SimulatorImpl'])
   16.11      ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration]
   16.12      module.add_enum('SynchronizationMode', ['SYNC_BEST_EFFORT', 'SYNC_HARD_LIMIT'], outer_class=root_module['ns3::RealtimeSimulatorImpl'])
   16.13 -    typehandlers.add_type_alias('ns3::TimeUnit< 2 >', 'ns3::TimeSquare')
   16.14 -    typehandlers.add_type_alias('ns3::TimeUnit< - 1 >', 'ns3::TimeInvert')
   16.15 -    typehandlers.add_type_alias('ns3::TimeUnit< 0 >', 'ns3::Scalar')
   16.16 -    typehandlers.add_type_alias('ns3::TimeUnit< 1 >', 'ns3::Time')
   16.17      
   16.18      ## Register a nested module for the namespace Config
   16.19      

    17.1 --- a/bindings/python/ns3_module_stats.py	Thu May 21 06:03:42 2009 -0700
    17.2 +++ b/bindings/python/ns3_module_stats.py	Thu May 21 06:04:40 2009 -0700
    17.3 @@ -1,4 +1,4 @@
    17.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    17.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    17.6  
    17.7  def register_types(module):
    17.8      root_module = module.get_root()
    17.9 @@ -25,8 +25,6 @@
   17.10      module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
   17.11      ## packet-data-calculators.h: ns3::PacketCounterCalculator [class]
   17.12      module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >'])
   17.13 -    typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList')
   17.14 -    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
   17.15      
   17.16      ## Register a nested module for the namespace Config
   17.17      

    18.1 --- a/bindings/python/ns3_module_tap_bridge.py	Thu May 21 06:03:42 2009 -0700
    18.2 +++ b/bindings/python/ns3_module_tap_bridge.py	Thu May 21 06:04:40 2009 -0700
    18.3 @@ -1,4 +1,4 @@
    18.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    18.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    18.6  
    18.7  def register_types(module):
    18.8      root_module = module.get_root()

    19.1 --- a/bindings/python/ns3_module_udp_echo.py	Thu May 21 06:03:42 2009 -0700
    19.2 +++ b/bindings/python/ns3_module_udp_echo.py	Thu May 21 06:04:40 2009 -0700
    19.3 @@ -1,4 +1,4 @@
    19.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    19.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    19.6  
    19.7  def register_types(module):
    19.8      root_module = module.get_root()

    20.1 --- a/bindings/python/ns3_module_v4ping.py	Thu May 21 06:03:42 2009 -0700
    20.2 +++ b/bindings/python/ns3_module_v4ping.py	Thu May 21 06:04:40 2009 -0700
    20.3 @@ -1,4 +1,4 @@
    20.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    20.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    20.6  
    20.7  def register_types(module):
    20.8      root_module = module.get_root()

    21.1 --- a/bindings/python/ns3_module_wifi.py	Thu May 21 06:03:42 2009 -0700
    21.2 +++ b/bindings/python/ns3_module_wifi.py	Thu May 21 06:04:40 2009 -0700
    21.3 @@ -1,4 +1,4 @@
    21.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    21.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    21.6  
    21.7  def register_types(module):
    21.8      root_module = module.get_root()
    21.9 @@ -135,7 +135,6 @@
   21.10      module.add_class('YansWifiChannel', parent=root_module['ns3::WifiChannel'])
   21.11      ## aarf-wifi-manager.h: ns3::AarfWifiManager [class]
   21.12      module.add_class('AarfWifiManager', parent=root_module['ns3::ArfWifiManager'])
   21.13 -    typehandlers.add_type_alias('std::vector< ns3::ThresholdsItem, std::allocator< ns3::ThresholdsItem > >', 'ns3::Thresholds')
   21.14      
   21.15      ## Register a nested module for the namespace Config
   21.16      

    22.1 --- a/bindings/python/ns3modulegen_generated.py	Thu May 21 06:03:42 2009 -0700
    22.2 +++ b/bindings/python/ns3modulegen_generated.py	Thu May 21 06:04:40 2009 -0700
    22.3 @@ -1,4 +1,4 @@
    22.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    22.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
    22.6  
    22.7  
    22.8  import pybindgen.settings