Regenerate bindings
authorTom Henderson <tomh@tomh.org>
Wed, 18 Aug 2010 13:58:50 -0700
changeset 658244bad54b1f97
parent 6581 b3597c013780
child 6583 b47b2f59d6a8
Regenerate bindings
bindings/python/apidefs/gcc-ILP32/callbacks_list.py
bindings/python/apidefs/gcc-ILP32/ns3_module_common.py
bindings/python/apidefs/gcc-ILP32/ns3_module_core.py
bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py
bindings/python/apidefs/gcc-ILP32/ns3_module_flow_monitor.py
bindings/python/apidefs/gcc-ILP32/ns3_module_node.py
bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py
bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py
bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py
bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py
bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py
bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py
bindings/python/apidefs/gcc-LP64/callbacks_list.py
bindings/python/apidefs/gcc-LP64/ns3_module_common.py
bindings/python/apidefs/gcc-LP64/ns3_module_core.py
bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py
bindings/python/apidefs/gcc-LP64/ns3_module_flow_monitor.py
bindings/python/apidefs/gcc-LP64/ns3_module_node.py
bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py
bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py
bindings/python/apidefs/gcc-LP64/ns3_module_spectrum.py
bindings/python/apidefs/gcc-LP64/ns3_module_stats.py
bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py
bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py
     1.1 --- a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py	Wed Aug 18 13:58:38 2010 -0700
     1.2 +++ b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py	Wed Aug 18 13:58:50 2010 -0700
     1.3 @@ -1,5 +1,4 @@
     1.4  callback_classes = [
     1.5 -    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     1.6      ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     1.7      ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     1.8      ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     1.9 @@ -28,6 +27,7 @@
    1.10      ['bool', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    1.11      ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    1.12      ['void', 'ns3::Ptr<ns3::ArpCache const>', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    1.13 +    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    1.14      ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    1.15      ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    1.16      ['void', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     2.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py	Wed Aug 18 13:58:38 2010 -0700
     2.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py	Wed Aug 18 13:58:50 2010 -0700
     2.3 @@ -1456,6 +1456,7 @@
     2.4      return
     2.5  
     2.6  def register_Ns3SpectrumValue_methods(root_module, cls):
     2.7 +    cls.add_output_stream_operator()
     2.8      cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
     2.9      cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
    2.10      cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
    2.11 @@ -1465,7 +1466,6 @@
    2.12      cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
    2.13      cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
    2.14      cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
    2.15 -    cls.add_output_stream_operator()
    2.16      cls.add_inplace_numeric_operator('*=', param('ns3::SpectrumValue const &', 'right'))
    2.17      cls.add_inplace_numeric_operator('*=', param('double', 'right'))
    2.18      cls.add_inplace_numeric_operator('+=', param('ns3::SpectrumValue const &', 'right'))
     3.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Wed Aug 18 13:58:38 2010 -0700
     3.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Wed Aug 18 13:58:50 2010 -0700
     3.3 @@ -218,6 +218,10 @@
     3.4      module.add_container('std::list< ns3::Ptr< ns3::UanTransducer > >', 'ns3::Ptr< ns3::UanTransducer >', container_type='list')
     3.5      module.add_container('std::vector< ns3::Ptr< ns3::NetDevice > >', 'ns3::Ptr< ns3::NetDevice >', container_type='vector')
     3.6      module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector')
     3.7 +    typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker')
     3.8 +    typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*')
     3.9 +    typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&')
    3.10 +    module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker')
    3.11      typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector')
    3.12      typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*')
    3.13      typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&')
    3.14 @@ -226,10 +230,6 @@
    3.15      typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*')
    3.16      typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&')
    3.17      module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue')
    3.18 -    typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker')
    3.19 -    typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*')
    3.20 -    typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&')
    3.21 -    module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker')
    3.22      
    3.23      ## Register a nested module for the namespace Config
    3.24      
    3.25 @@ -1345,9 +1345,9 @@
    3.26  
    3.27  def register_Ns3TypeId_methods(root_module, cls):
    3.28      cls.add_binary_comparison_operator('!=')
    3.29 -    cls.add_binary_comparison_operator('<')
    3.30      cls.add_output_stream_operator()
    3.31      cls.add_binary_comparison_operator('==')
    3.32 +    cls.add_binary_comparison_operator('<')
    3.33      ## type-id.h: ns3::TypeId::TypeId(char const * name) [constructor]
    3.34      cls.add_constructor([param('char const *', 'name')])
    3.35      ## type-id.h: ns3::TypeId::TypeId() [constructor]
    3.36 @@ -3171,7 +3171,7 @@
    3.37      module.add_function('TypeNameGet', 
    3.38                          'std::string', 
    3.39                          [], 
    3.40 -                        template_parameters=['long long'])
    3.41 +                        template_parameters=['long'])
    3.42      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
    3.43      module.add_function('TypeNameGet', 
    3.44                          'std::string', 
     4.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py	Wed Aug 18 13:58:38 2010 -0700
     4.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py	Wed Aug 18 13:58:50 2010 -0700
     4.3 @@ -73,18 +73,18 @@
     4.4  def register_types_ns3_dot11s(module):
     4.5      root_module = module.get_root()
     4.6      
     4.7 +    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration]
     4.8 +    module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
     4.9 +    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
    4.10 +    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
    4.11      ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionProtocol [enumeration]
    4.12      module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP'])
    4.13      ## ie-dot11s-configuration.h: ns3::dot11s::dot11sSynchronizationProtocolIdentifier [enumeration]
    4.14      module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])
    4.15 -    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration]
    4.16 -    module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
    4.17 +    ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration]
    4.18 +    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
    4.19      ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration]
    4.20      module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
    4.21 -    ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration]
    4.22 -    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
    4.23 -    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
    4.24 -    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
    4.25      ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class]
    4.26      module.add_class('Dot11sMeshCapability')
    4.27      ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class]
     5.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_flow_monitor.py	Wed Aug 18 13:58:38 2010 -0700
     5.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_flow_monitor.py	Wed Aug 18 13:58:50 2010 -0700
     5.3 @@ -385,8 +385,8 @@
     5.4      return
     5.5  
     5.6  def register_Ns3Ipv4FlowClassifierFiveTuple_methods(root_module, cls):
     5.7 +    cls.add_binary_comparison_operator('==')
     5.8      cls.add_binary_comparison_operator('<')
     5.9 -    cls.add_binary_comparison_operator('==')
    5.10      ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple() [constructor]
    5.11      cls.add_constructor([])
    5.12      ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple(ns3::Ipv4FlowClassifier::FiveTuple const & arg0) [copy constructor]
     6.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py	Wed Aug 18 13:58:38 2010 -0700
     6.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py	Wed Aug 18 13:58:50 2010 -0700
     6.3 @@ -212,9 +212,6 @@
     6.4      module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set')
     6.5      module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector')
     6.6      module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector')
     6.7 -    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback')
     6.8 -    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*')
     6.9 -    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&')
    6.10      typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback')
    6.11      typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*')
    6.12      typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&')
    6.13 @@ -227,6 +224,9 @@
    6.14      typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxStartCallback')
    6.15      typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxStartCallback*')
    6.16      typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxStartCallback&')
    6.17 +    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback')
    6.18 +    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*')
    6.19 +    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&')
    6.20      
    6.21      ## Register a nested module for the namespace Config
    6.22      
    6.23 @@ -390,9 +390,9 @@
    6.24  
    6.25  def register_Ns3Address_methods(root_module, cls):
    6.26      cls.add_binary_comparison_operator('!=')
    6.27 -    cls.add_binary_comparison_operator('<')
    6.28      cls.add_output_stream_operator()
    6.29      cls.add_binary_comparison_operator('==')
    6.30 +    cls.add_binary_comparison_operator('<')
    6.31      ## address.h: ns3::Address::Address() [constructor]
    6.32      cls.add_constructor([])
    6.33      ## address.h: ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor]
    6.34 @@ -578,9 +578,9 @@
    6.35  
    6.36  def register_Ns3Ipv4Address_methods(root_module, cls):
    6.37      cls.add_binary_comparison_operator('!=')
    6.38 -    cls.add_binary_comparison_operator('<')
    6.39      cls.add_output_stream_operator()
    6.40      cls.add_binary_comparison_operator('==')
    6.41 +    cls.add_binary_comparison_operator('<')
    6.42      ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
    6.43      cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
    6.44      ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address() [constructor]
    6.45 @@ -862,9 +862,9 @@
    6.46  
    6.47  def register_Ns3Ipv6Address_methods(root_module, cls):
    6.48      cls.add_binary_comparison_operator('!=')
    6.49 -    cls.add_binary_comparison_operator('<')
    6.50      cls.add_output_stream_operator()
    6.51      cls.add_binary_comparison_operator('==')
    6.52 +    cls.add_binary_comparison_operator('<')
    6.53      ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address() [constructor]
    6.54      cls.add_constructor([])
    6.55      ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(char const * address) [constructor]
    6.56 @@ -1129,9 +1129,9 @@
    6.57  
    6.58  def register_Ns3Mac48Address_methods(root_module, cls):
    6.59      cls.add_binary_comparison_operator('!=')
    6.60 -    cls.add_binary_comparison_operator('<')
    6.61      cls.add_output_stream_operator()
    6.62      cls.add_binary_comparison_operator('==')
    6.63 +    cls.add_binary_comparison_operator('<')
    6.64      ## mac48-address.h: ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
    6.65      cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
    6.66      ## mac48-address.h: ns3::Mac48Address::Mac48Address() [constructor]
     7.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py	Wed Aug 18 13:58:38 2010 -0700
     7.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py	Wed Aug 18 13:58:50 2010 -0700
     7.3 @@ -140,39 +140,39 @@
     7.4      module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector')
     7.5      module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector')
     7.6      module.add_container('std::vector< ns3::olsr::RoutingTableEntry >', 'ns3::olsr::RoutingTableEntry', container_type='vector')
     7.7 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
     7.8 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >*', 'ns3::olsr::TopologySet*')
     7.9 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >&', 'ns3::olsr::TopologySet&')
    7.10 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
    7.11 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >*', 'ns3::olsr::MprSet*')
    7.12 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >&', 'ns3::olsr::MprSet&')
    7.13 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
    7.14 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >*', 'ns3::olsr::MprSelectorSet*')
    7.15 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >&', 'ns3::olsr::MprSelectorSet&')
    7.16 +    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations')
    7.17 +    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*')
    7.18 +    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&')
    7.19 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
    7.20 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >*', 'ns3::olsr::IfaceAssocSet*')
    7.21 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >&', 'ns3::olsr::IfaceAssocSet&')
    7.22 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
    7.23 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >*', 'ns3::olsr::TwoHopNeighborSet*')
    7.24 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >&', 'ns3::olsr::TwoHopNeighborSet&')
    7.25      typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet')
    7.26      typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*')
    7.27      typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&')
    7.28 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
    7.29 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*')
    7.30 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&')
    7.31      typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet')
    7.32      typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >*', 'ns3::olsr::NeighborSet*')
    7.33      typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >&', 'ns3::olsr::NeighborSet&')
    7.34      typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >', 'ns3::olsr::AssociationSet')
    7.35      typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >*', 'ns3::olsr::AssociationSet*')
    7.36      typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >&', 'ns3::olsr::AssociationSet&')
    7.37 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
    7.38 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >*', 'ns3::olsr::TopologySet*')
    7.39 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >&', 'ns3::olsr::TopologySet&')
    7.40      typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet')
    7.41      typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >*', 'ns3::olsr::LinkSet*')
    7.42      typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >&', 'ns3::olsr::LinkSet&')
    7.43 -    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations')
    7.44 -    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*')
    7.45 -    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&')
    7.46 -    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
    7.47 -    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >*', 'ns3::olsr::MprSet*')
    7.48 -    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >&', 'ns3::olsr::MprSet&')
    7.49 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
    7.50 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >*', 'ns3::olsr::MprSelectorSet*')
    7.51 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >&', 'ns3::olsr::MprSelectorSet&')
    7.52 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
    7.53 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*')
    7.54 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&')
    7.55 -    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
    7.56 -    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >*', 'ns3::olsr::IfaceAssocSet*')
    7.57 -    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >&', 'ns3::olsr::IfaceAssocSet&')
    7.58 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
    7.59 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >*', 'ns3::olsr::TwoHopNeighborSet*')
    7.60 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >&', 'ns3::olsr::TwoHopNeighborSet&')
    7.61  
    7.62  def register_methods(root_module):
    7.63      register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState'])
     8.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py	Wed Aug 18 13:58:38 2010 -0700
     8.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py	Wed Aug 18 13:58:50 2010 -0700
     8.3 @@ -5,7 +5,7 @@
     8.4      
     8.5      ## event-id.h: ns3::EventId [class]
     8.6      module.add_class('EventId')
     8.7 -    ## high-precision-128.h: ns3::HighPrecision [class]
     8.8 +    ## high-precision-double.h: ns3::HighPrecision [class]
     8.9      module.add_class('HighPrecision')
    8.10      ## simulator.h: ns3::Simulator [class]
    8.11      module.add_class('Simulator', is_singleton=True)
    8.12 @@ -67,14 +67,14 @@
    8.13      module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker'])
    8.14      ## nstime.h: ns3::TimeValue [class]
    8.15      module.add_class('TimeValue', parent=root_module['ns3::AttributeValue'])
    8.16 +    typehandlers.add_type_alias('ns3::Time', 'ns3::TimeInvert')
    8.17 +    typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeInvert*')
    8.18 +    typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeInvert&')
    8.19 +    module.add_typedef(root_module['ns3::Time'], 'TimeInvert')
    8.20      typehandlers.add_type_alias('ns3::Time', 'ns3::TimeSquare')
    8.21      typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeSquare*')
    8.22      typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeSquare&')
    8.23      module.add_typedef(root_module['ns3::Time'], 'TimeSquare')
    8.24 -    typehandlers.add_type_alias('ns3::Time', 'ns3::TimeInvert')
    8.25 -    typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeInvert*')
    8.26 -    typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeInvert&')
    8.27 -    module.add_typedef(root_module['ns3::Time'], 'TimeInvert')
    8.28      
    8.29      ## Register a nested module for the namespace Config
    8.30      
    8.31 @@ -230,68 +230,65 @@
    8.32      return
    8.33  
    8.34  def register_Ns3HighPrecision_methods(root_module, cls):
    8.35 -    cls.add_output_stream_operator()
    8.36 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor]
    8.37 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor]
    8.38      cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')])
    8.39 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor]
    8.40 -    cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')])
    8.41 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor]
    8.42 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision() [constructor]
    8.43      cls.add_constructor([])
    8.44 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor]
    8.45 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor]
    8.46      cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')])
    8.47 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor]
    8.48 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision(double value) [constructor]
    8.49      cls.add_constructor([param('double', 'value')])
    8.50 -    ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function]
    8.51 +    ## high-precision-double.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function]
    8.52      cls.add_method('Add', 
    8.53                     'void', 
    8.54                     [param('ns3::HighPrecision const &', 'o')])
    8.55 -    ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function]
    8.56 +    ## high-precision-double.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function]
    8.57      cls.add_method('Compare', 
    8.58                     'int', 
    8.59                     [param('ns3::HighPrecision const &', 'o')], 
    8.60                     is_const=True)
    8.61 -    ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function]
    8.62 +    ## high-precision-double.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function]
    8.63      cls.add_method('Div', 
    8.64                     'void', 
    8.65                     [param('ns3::HighPrecision const &', 'o')])
    8.66 -    ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function]
    8.67 +    ## high-precision-double.h: double ns3::HighPrecision::GetDouble() const [member function]
    8.68      cls.add_method('GetDouble', 
    8.69                     'double', 
    8.70                     [], 
    8.71                     is_const=True)
    8.72 -    ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function]
    8.73 +    ## high-precision-double.h: int64_t ns3::HighPrecision::GetHigh() const [member function]
    8.74      cls.add_method('GetHigh', 
    8.75                     'int64_t', 
    8.76                     [], 
    8.77                     is_const=True)
    8.78 -    ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function]
    8.79 +    ## high-precision-double.h: int64_t ns3::HighPrecision::GetInteger() const [member function]
    8.80      cls.add_method('GetInteger', 
    8.81                     'int64_t', 
    8.82                     [], 
    8.83                     is_const=True)
    8.84 -    ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function]
    8.85 +    ## high-precision-double.h: uint64_t ns3::HighPrecision::GetLow() const [member function]
    8.86      cls.add_method('GetLow', 
    8.87                     'uint64_t', 
    8.88                     [], 
    8.89                     is_const=True)
    8.90 -    ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function]
    8.91 +    ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function]
    8.92      cls.add_method('Invert', 
    8.93                     'ns3::HighPrecision', 
    8.94                     [param('uint64_t', 'v')], 
    8.95                     is_static=True)
    8.96 -    ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function]
    8.97 +    ## high-precision-double.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function]
    8.98      cls.add_method('Mul', 
    8.99                     'void', 
   8.100                     [param('ns3::HighPrecision const &', 'o')])
   8.101 -    ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function]
   8.102 +    ## high-precision-double.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function]
   8.103      cls.add_method('MulByInvert', 
   8.104                     'void', 
   8.105                     [param('ns3::HighPrecision const &', 'o')])
   8.106 -    ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function]
   8.107 +    ## high-precision-double.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function]
   8.108      cls.add_method('Sub', 
   8.109                     'void', 
   8.110                     [param('ns3::HighPrecision const &', 'o')])
   8.111 -    ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function]
   8.112 +    ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function]
   8.113      cls.add_method('Zero', 
   8.114                     'ns3::HighPrecision', 
   8.115                     [], 
   8.116 @@ -390,6 +387,13 @@
   8.117  
   8.118  def register_Ns3Time_methods(root_module, cls):
   8.119      cls.add_binary_comparison_operator('!=')
   8.120 +    cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right'))
   8.121 +    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
   8.122 +    cls.add_inplace_numeric_operator('/=', param('ns3::Time const &', 'right'))
   8.123 +    cls.add_output_stream_operator()
   8.124 +    cls.add_binary_comparison_operator('<=')
   8.125 +    cls.add_binary_comparison_operator('==')
   8.126 +    cls.add_binary_comparison_operator('>=')
   8.127      cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
   8.128      cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
   8.129      cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
   8.130 @@ -397,13 +401,6 @@
   8.131      cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
   8.132      cls.add_binary_comparison_operator('<')
   8.133      cls.add_binary_comparison_operator('>')
   8.134 -    cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right'))
   8.135 -    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
   8.136 -    cls.add_inplace_numeric_operator('/=', param('ns3::Time const &', 'right'))
   8.137 -    cls.add_output_stream_operator()
   8.138 -    cls.add_binary_comparison_operator('<=')
   8.139 -    cls.add_binary_comparison_operator('==')
   8.140 -    cls.add_binary_comparison_operator('>=')
   8.141      ## nstime.h: ns3::Time::Time() [constructor]
   8.142      cls.add_constructor([])
   8.143      ## nstime.h: ns3::Time::Time(ns3::Time const & o) [copy constructor]
     9.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py	Wed Aug 18 13:58:38 2010 -0700
     9.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py	Wed Aug 18 13:58:50 2010 -0700
     9.3 @@ -39,15 +39,15 @@
     9.4      module.add_class('MultiModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel'])
     9.5      ## single-model-spectrum-channel.h: ns3::SingleModelSpectrumChannel [class]
     9.6      module.add_class('SingleModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel'])
     9.7 +    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t')
     9.8 +    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*')
     9.9 +    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&')
    9.10      typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >', 'ns3::TxSpectrumModelInfoMap_t')
    9.11      typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >*', 'ns3::TxSpectrumModelInfoMap_t*')
    9.12      typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >&', 'ns3::TxSpectrumModelInfoMap_t&')
    9.13      typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >', 'ns3::RxSpectrumModelInfoMap_t')
    9.14      typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >*', 'ns3::RxSpectrumModelInfoMap_t*')
    9.15      typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >&', 'ns3::RxSpectrumModelInfoMap_t&')
    9.16 -    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t')
    9.17 -    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*')
    9.18 -    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&')
    9.19      
    9.20      ## Register a nested module for the namespace Config
    9.21      
    10.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py	Wed Aug 18 13:58:38 2010 -0700
    10.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py	Wed Aug 18 13:58:50 2010 -0700
    10.3 @@ -27,12 +27,12 @@
    10.4      module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
    10.5      ## packet-data-calculators.h: ns3::PacketCounterCalculator [class]
    10.6      module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >'])
    10.7 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
    10.8 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*')
    10.9 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&')
   10.10      typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList')
   10.11      typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*')
   10.12      typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&')
   10.13 -    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
   10.14 -    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*')
   10.15 -    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&')
   10.16      
   10.17      ## Register a nested module for the namespace Config
   10.18      
    11.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py	Wed Aug 18 13:58:38 2010 -0700
    11.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py	Wed Aug 18 13:58:50 2010 -0700
    11.3 @@ -11,16 +11,16 @@
    11.4      module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'])
    11.5      ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration]
    11.6      module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_UNKNOWN'])
    11.7 +    ## qos-utils.h: ns3::AcIndex [enumeration]
    11.8 +    module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'])
    11.9 +    ## ctrl-headers.h: ns3::BlockAckType [enumeration]
   11.10 +    module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'])
   11.11      ## qos-tag.h: ns3::UserPriority [enumeration]
   11.12      module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
   11.13 -    ## qos-utils.h: ns3::AcIndex [enumeration]
   11.14 -    module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'])
   11.15 +    ## wifi-mode.h: ns3::WifiCodeRate [enumeration]
   11.16 +    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'])
   11.17      ## edca-txop-n.h: ns3::TypeOfStation [enumeration]
   11.18      module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA'])
   11.19 -    ## ctrl-headers.h: ns3::BlockAckType [enumeration]
   11.20 -    module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'])
   11.21 -    ## wifi-mode.h: ns3::WifiCodeRate [enumeration]
   11.22 -    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'])
   11.23      ## block-ack-manager.h: ns3::Bar [struct]
   11.24      module.add_class('Bar')
   11.25      ## block-ack-agreement.h: ns3::BlockAckAgreement [class]
   11.26 @@ -204,18 +204,18 @@
   11.27      ## dca-txop.h: ns3::DcaTxop [class]
   11.28      module.add_class('DcaTxop', parent=root_module['ns3::Dcf'])
   11.29      module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
   11.30 +    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
   11.31 +    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
   11.32 +    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
   11.33 +    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
   11.34 +    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
   11.35 +    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
   11.36      typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId')
   11.37      typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*')
   11.38      typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&')
   11.39 -    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
   11.40 -    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
   11.41 -    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
   11.42      typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate')
   11.43      typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*')
   11.44      typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&')
   11.45 -    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
   11.46 -    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
   11.47 -    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
   11.48      typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >', 'ns3::SampleRate')
   11.49      typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >*', 'ns3::SampleRate*')
   11.50      typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >&', 'ns3::SampleRate&')
    12.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Wed Aug 18 13:58:38 2010 -0700
    12.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Wed Aug 18 13:58:50 2010 -0700
    12.3 @@ -1406,9 +1406,9 @@
    12.4  
    12.5  def register_Ns3UanAddress_methods(root_module, cls):
    12.6      cls.add_binary_comparison_operator('!=')
    12.7 -    cls.add_binary_comparison_operator('<')
    12.8      cls.add_output_stream_operator()
    12.9      cls.add_binary_comparison_operator('==')
   12.10 +    cls.add_binary_comparison_operator('<')
   12.11      ## uan-address.h: ns3::UanAddress::UanAddress(ns3::UanAddress const & arg0) [copy constructor]
   12.12      cls.add_constructor([param('ns3::UanAddress const &', 'arg0')])
   12.13      ## uan-address.h: ns3::UanAddress::UanAddress() [constructor]
    13.1 --- a/bindings/python/apidefs/gcc-LP64/callbacks_list.py	Wed Aug 18 13:58:38 2010 -0700
    13.2 +++ b/bindings/python/apidefs/gcc-LP64/callbacks_list.py	Wed Aug 18 13:58:50 2010 -0700
    13.3 @@ -1,5 +1,4 @@
    13.4  callback_classes = [
    13.5 -    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    13.6      ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    13.7      ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    13.8      ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    13.9 @@ -28,6 +27,7 @@
   13.10      ['bool', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
   13.11      ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
   13.12      ['void', 'ns3::Ptr<ns3::ArpCache const>', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
   13.13 +    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
   13.14      ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
   13.15      ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
   13.16      ['void', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
    14.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py	Wed Aug 18 13:58:38 2010 -0700
    14.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py	Wed Aug 18 13:58:50 2010 -0700
    14.3 @@ -1456,6 +1456,7 @@
    14.4      return
    14.5  
    14.6  def register_Ns3SpectrumValue_methods(root_module, cls):
    14.7 +    cls.add_output_stream_operator()
    14.8      cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
    14.9      cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
   14.10      cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
   14.11 @@ -1465,7 +1466,6 @@
   14.12      cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
   14.13      cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right'))
   14.14      cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right'))
   14.15 -    cls.add_output_stream_operator()
   14.16      cls.add_inplace_numeric_operator('*=', param('ns3::SpectrumValue const &', 'right'))
   14.17      cls.add_inplace_numeric_operator('*=', param('double', 'right'))
   14.18      cls.add_inplace_numeric_operator('+=', param('ns3::SpectrumValue const &', 'right'))
    15.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Wed Aug 18 13:58:38 2010 -0700
    15.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Wed Aug 18 13:58:50 2010 -0700
    15.3 @@ -218,6 +218,10 @@
    15.4      module.add_container('std::list< ns3::Ptr< ns3::UanTransducer > >', 'ns3::Ptr< ns3::UanTransducer >', container_type='list')
    15.5      module.add_container('std::vector< ns3::Ptr< ns3::NetDevice > >', 'ns3::Ptr< ns3::NetDevice >', container_type='vector')
    15.6      module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector')
    15.7 +    typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker')
    15.8 +    typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*')
    15.9 +    typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&')
   15.10 +    module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker')
   15.11      typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector')
   15.12      typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*')
   15.13      typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&')
   15.14 @@ -226,10 +230,6 @@
   15.15      typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*')
   15.16      typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&')
   15.17      module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue')
   15.18 -    typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker')
   15.19 -    typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*')
   15.20 -    typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&')
   15.21 -    module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker')
   15.22      
   15.23      ## Register a nested module for the namespace Config
   15.24      
   15.25 @@ -1345,9 +1345,9 @@
   15.26  
   15.27  def register_Ns3TypeId_methods(root_module, cls):
   15.28      cls.add_binary_comparison_operator('!=')
   15.29 -    cls.add_binary_comparison_operator('<')
   15.30      cls.add_output_stream_operator()
   15.31      cls.add_binary_comparison_operator('==')
   15.32 +    cls.add_binary_comparison_operator('<')
   15.33      ## type-id.h: ns3::TypeId::TypeId(char const * name) [constructor]
   15.34      cls.add_constructor([param('char const *', 'name')])
   15.35      ## type-id.h: ns3::TypeId::TypeId() [constructor]
    16.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py	Wed Aug 18 13:58:38 2010 -0700
    16.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py	Wed Aug 18 13:58:50 2010 -0700
    16.3 @@ -73,18 +73,18 @@
    16.4  def register_types_ns3_dot11s(module):
    16.5      root_module = module.get_root()
    16.6      
    16.7 -    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sSynchronizationProtocolIdentifier [enumeration]
    16.8 -    module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])
    16.9      ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration]
   16.10      module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
   16.11 -    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration]
   16.12 -    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
   16.13 -    ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration]
   16.14 -    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
   16.15      ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionProtocol [enumeration]
   16.16      module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP'])
   16.17      ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
   16.18      module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
   16.19 +    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sSynchronizationProtocolIdentifier [enumeration]
   16.20 +    module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])
   16.21 +    ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration]
   16.22 +    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
   16.23 +    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration]
   16.24 +    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
   16.25      ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class]
   16.26      module.add_class('Dot11sMeshCapability')
   16.27      ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class]
    17.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_flow_monitor.py	Wed Aug 18 13:58:38 2010 -0700
    17.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_flow_monitor.py	Wed Aug 18 13:58:50 2010 -0700
    17.3 @@ -385,8 +385,8 @@
    17.4      return
    17.5  
    17.6  def register_Ns3Ipv4FlowClassifierFiveTuple_methods(root_module, cls):
    17.7 +    cls.add_binary_comparison_operator('==')
    17.8      cls.add_binary_comparison_operator('<')
    17.9 -    cls.add_binary_comparison_operator('==')
   17.10      ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple() [constructor]
   17.11      cls.add_constructor([])
   17.12      ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple(ns3::Ipv4FlowClassifier::FiveTuple const & arg0) [copy constructor]
    18.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_node.py	Wed Aug 18 13:58:38 2010 -0700
    18.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_node.py	Wed Aug 18 13:58:50 2010 -0700
    18.3 @@ -212,9 +212,6 @@
    18.4      module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set')
    18.5      module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector')
    18.6      module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector')
    18.7 -    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback')
    18.8 -    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*')
    18.9 -    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&')
   18.10      typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback')
   18.11      typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*')
   18.12      typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&')
   18.13 @@ -227,6 +224,9 @@
   18.14      typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxStartCallback')
   18.15      typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxStartCallback*')
   18.16      typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxStartCallback&')
   18.17 +    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback')
   18.18 +    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*')
   18.19 +    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&')
   18.20      
   18.21      ## Register a nested module for the namespace Config
   18.22      
   18.23 @@ -390,9 +390,9 @@
   18.24  
   18.25  def register_Ns3Address_methods(root_module, cls):
   18.26      cls.add_binary_comparison_operator('!=')
   18.27 -    cls.add_binary_comparison_operator('<')
   18.28      cls.add_output_stream_operator()
   18.29      cls.add_binary_comparison_operator('==')
   18.30 +    cls.add_binary_comparison_operator('<')
   18.31      ## address.h: ns3::Address::Address() [constructor]
   18.32      cls.add_constructor([])
   18.33      ## address.h: ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor]
   18.34 @@ -578,9 +578,9 @@
   18.35  
   18.36  def register_Ns3Ipv4Address_methods(root_module, cls):
   18.37      cls.add_binary_comparison_operator('!=')
   18.38 -    cls.add_binary_comparison_operator('<')
   18.39      cls.add_output_stream_operator()
   18.40      cls.add_binary_comparison_operator('==')
   18.41 +    cls.add_binary_comparison_operator('<')
   18.42      ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
   18.43      cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
   18.44      ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address() [constructor]
   18.45 @@ -862,9 +862,9 @@
   18.46  
   18.47  def register_Ns3Ipv6Address_methods(root_module, cls):
   18.48      cls.add_binary_comparison_operator('!=')
   18.49 -    cls.add_binary_comparison_operator('<')
   18.50      cls.add_output_stream_operator()
   18.51      cls.add_binary_comparison_operator('==')
   18.52 +    cls.add_binary_comparison_operator('<')
   18.53      ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address() [constructor]
   18.54      cls.add_constructor([])
   18.55      ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(char const * address) [constructor]
   18.56 @@ -1129,9 +1129,9 @@
   18.57  
   18.58  def register_Ns3Mac48Address_methods(root_module, cls):
   18.59      cls.add_binary_comparison_operator('!=')
   18.60 -    cls.add_binary_comparison_operator('<')
   18.61      cls.add_output_stream_operator()
   18.62      cls.add_binary_comparison_operator('==')
   18.63 +    cls.add_binary_comparison_operator('<')
   18.64      ## mac48-address.h: ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
   18.65      cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
   18.66      ## mac48-address.h: ns3::Mac48Address::Mac48Address() [constructor]
    19.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py	Wed Aug 18 13:58:38 2010 -0700
    19.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py	Wed Aug 18 13:58:50 2010 -0700
    19.3 @@ -140,39 +140,39 @@
    19.4      module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector')
    19.5      module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector')
    19.6      module.add_container('std::vector< ns3::olsr::RoutingTableEntry >', 'ns3::olsr::RoutingTableEntry', container_type='vector')
    19.7 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
    19.8 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >*', 'ns3::olsr::TopologySet*')
    19.9 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >&', 'ns3::olsr::TopologySet&')
   19.10 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
   19.11 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >*', 'ns3::olsr::MprSet*')
   19.12 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >&', 'ns3::olsr::MprSet&')
   19.13 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
   19.14 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >*', 'ns3::olsr::MprSelectorSet*')
   19.15 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >&', 'ns3::olsr::MprSelectorSet&')
   19.16 +    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations')
   19.17 +    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*')
   19.18 +    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&')
   19.19 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
   19.20 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >*', 'ns3::olsr::IfaceAssocSet*')
   19.21 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >&', 'ns3::olsr::IfaceAssocSet&')
   19.22 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
   19.23 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >*', 'ns3::olsr::TwoHopNeighborSet*')
   19.24 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >&', 'ns3::olsr::TwoHopNeighborSet&')
   19.25      typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet')
   19.26      typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*')
   19.27      typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&')
   19.28 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
   19.29 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*')
   19.30 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&')
   19.31      typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet')
   19.32      typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >*', 'ns3::olsr::NeighborSet*')
   19.33      typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >&', 'ns3::olsr::NeighborSet&')
   19.34      typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >', 'ns3::olsr::AssociationSet')
   19.35      typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >*', 'ns3::olsr::AssociationSet*')
   19.36      typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >&', 'ns3::olsr::AssociationSet&')
   19.37 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
   19.38 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >*', 'ns3::olsr::TopologySet*')
   19.39 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >&', 'ns3::olsr::TopologySet&')
   19.40      typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet')
   19.41      typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >*', 'ns3::olsr::LinkSet*')
   19.42      typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >&', 'ns3::olsr::LinkSet&')
   19.43 -    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations')
   19.44 -    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*')
   19.45 -    typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&')
   19.46 -    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
   19.47 -    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >*', 'ns3::olsr::MprSet*')
   19.48 -    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >&', 'ns3::olsr::MprSet&')
   19.49 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
   19.50 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >*', 'ns3::olsr::MprSelectorSet*')
   19.51 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >&', 'ns3::olsr::MprSelectorSet&')
   19.52 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
   19.53 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*')
   19.54 -    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&')
   19.55 -    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
   19.56 -    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >*', 'ns3::olsr::IfaceAssocSet*')
   19.57 -    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >&', 'ns3::olsr::IfaceAssocSet&')
   19.58 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
   19.59 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >*', 'ns3::olsr::TwoHopNeighborSet*')
   19.60 -    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >&', 'ns3::olsr::TwoHopNeighborSet&')
   19.61  
   19.62  def register_methods(root_module):
   19.63      register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState'])
    20.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py	Wed Aug 18 13:58:38 2010 -0700
    20.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py	Wed Aug 18 13:58:50 2010 -0700
    20.3 @@ -5,7 +5,7 @@
    20.4      
    20.5      ## event-id.h: ns3::EventId [class]
    20.6      module.add_class('EventId')
    20.7 -    ## high-precision-128.h: ns3::HighPrecision [class]
    20.8 +    ## high-precision-double.h: ns3::HighPrecision [class]
    20.9      module.add_class('HighPrecision')
   20.10      ## simulator.h: ns3::Simulator [class]
   20.11      module.add_class('Simulator', is_singleton=True)
   20.12 @@ -67,14 +67,14 @@
   20.13      module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker'])
   20.14      ## nstime.h: ns3::TimeValue [class]
   20.15      module.add_class('TimeValue', parent=root_module['ns3::AttributeValue'])
   20.16 +    typehandlers.add_type_alias('ns3::Time', 'ns3::TimeInvert')
   20.17 +    typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeInvert*')
   20.18 +    typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeInvert&')
   20.19 +    module.add_typedef(root_module['ns3::Time'], 'TimeInvert')
   20.20      typehandlers.add_type_alias('ns3::Time', 'ns3::TimeSquare')
   20.21      typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeSquare*')
   20.22      typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeSquare&')
   20.23      module.add_typedef(root_module['ns3::Time'], 'TimeSquare')
   20.24 -    typehandlers.add_type_alias('ns3::Time', 'ns3::TimeInvert')
   20.25 -    typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeInvert*')
   20.26 -    typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeInvert&')
   20.27 -    module.add_typedef(root_module['ns3::Time'], 'TimeInvert')
   20.28      
   20.29      ## Register a nested module for the namespace Config
   20.30      
   20.31 @@ -230,68 +230,65 @@
   20.32      return
   20.33  
   20.34  def register_Ns3HighPrecision_methods(root_module, cls):
   20.35 -    cls.add_output_stream_operator()
   20.36 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor]
   20.37 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor]
   20.38      cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')])
   20.39 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor]
   20.40 -    cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')])
   20.41 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor]
   20.42 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision() [constructor]
   20.43      cls.add_constructor([])
   20.44 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor]
   20.45 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor]
   20.46      cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')])
   20.47 -    ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor]
   20.48 +    ## high-precision-double.h: ns3::HighPrecision::HighPrecision(double value) [constructor]
   20.49      cls.add_constructor([param('double', 'value')])
   20.50 -    ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function]
   20.51 +    ## high-precision-double.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function]
   20.52      cls.add_method('Add', 
   20.53                     'void', 
   20.54                     [param('ns3::HighPrecision const &', 'o')])
   20.55 -    ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function]
   20.56 +    ## high-precision-double.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function]
   20.57      cls.add_method('Compare', 
   20.58                     'int', 
   20.59                     [param('ns3::HighPrecision const &', 'o')], 
   20.60                     is_const=True)
   20.61 -    ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function]
   20.62 +    ## high-precision-double.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function]
   20.63      cls.add_method('Div', 
   20.64                     'void', 
   20.65                     [param('ns3::HighPrecision const &', 'o')])
   20.66 -    ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function]
   20.67 +    ## high-precision-double.h: double ns3::HighPrecision::GetDouble() const [member function]
   20.68      cls.add_method('GetDouble', 
   20.69                     'double', 
   20.70                     [], 
   20.71                     is_const=True)
   20.72 -    ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function]
   20.73 +    ## high-precision-double.h: int64_t ns3::HighPrecision::GetHigh() const [member function]
   20.74      cls.add_method('GetHigh', 
   20.75                     'int64_t', 
   20.76                     [], 
   20.77                     is_const=True)
   20.78 -    ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function]
   20.79 +    ## high-precision-double.h: int64_t ns3::HighPrecision::GetInteger() const [member function]
   20.80      cls.add_method('GetInteger', 
   20.81                     'int64_t', 
   20.82                     [], 
   20.83                     is_const=True)
   20.84 -    ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function]
   20.85 +    ## high-precision-double.h: uint64_t ns3::HighPrecision::GetLow() const [member function]
   20.86      cls.add_method('GetLow', 
   20.87                     'uint64_t', 
   20.88                     [], 
   20.89                     is_const=True)
   20.90 -    ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function]
   20.91 +    ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function]
   20.92      cls.add_method('Invert', 
   20.93                     'ns3::HighPrecision', 
   20.94                     [param('uint64_t', 'v')], 
   20.95                     is_static=True)
   20.96 -    ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function]
   20.97 +    ## high-precision-double.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function]
   20.98      cls.add_method('Mul', 
   20.99                     'void', 
  20.100                     [param('ns3::HighPrecision const &', 'o')])
  20.101 -    ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function]
  20.102 +    ## high-precision-double.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function]
  20.103      cls.add_method('MulByInvert', 
  20.104                     'void', 
  20.105                     [param('ns3::HighPrecision const &', 'o')])
  20.106 -    ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function]
  20.107 +    ## high-precision-double.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function]
  20.108      cls.add_method('Sub', 
  20.109                     'void', 
  20.110                     [param('ns3::HighPrecision const &', 'o')])
  20.111 -    ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function]
  20.112 +    ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function]
  20.113      cls.add_method('Zero', 
  20.114                     'ns3::HighPrecision', 
  20.115                     [], 
  20.116 @@ -390,6 +387,13 @@
  20.117  
  20.118  def register_Ns3Time_methods(root_module, cls):
  20.119      cls.add_binary_comparison_operator('!=')
  20.120 +    cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right'))
  20.121 +    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
  20.122 +    cls.add_inplace_numeric_operator('/=', param('ns3::Time const &', 'right'))
  20.123 +    cls.add_output_stream_operator()
  20.124 +    cls.add_binary_comparison_operator('<=')
  20.125 +    cls.add_binary_comparison_operator('==')
  20.126 +    cls.add_binary_comparison_operator('>=')
  20.127      cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
  20.128      cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
  20.129      cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
  20.130 @@ -397,13 +401,6 @@
  20.131      cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
  20.132      cls.add_binary_comparison_operator('<')
  20.133      cls.add_binary_comparison_operator('>')
  20.134 -    cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right'))
  20.135 -    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
  20.136 -    cls.add_inplace_numeric_operator('/=', param('ns3::Time const &', 'right'))
  20.137 -    cls.add_output_stream_operator()
  20.138 -    cls.add_binary_comparison_operator('<=')
  20.139 -    cls.add_binary_comparison_operator('==')
  20.140 -    cls.add_binary_comparison_operator('>=')
  20.141      ## nstime.h: ns3::Time::Time() [constructor]
  20.142      cls.add_constructor([])
  20.143      ## nstime.h: ns3::Time::Time(ns3::Time const & o) [copy constructor]
    21.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_spectrum.py	Wed Aug 18 13:58:38 2010 -0700
    21.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_spectrum.py	Wed Aug 18 13:58:50 2010 -0700
    21.3 @@ -39,15 +39,15 @@
    21.4      module.add_class('MultiModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel'])
    21.5      ## single-model-spectrum-channel.h: ns3::SingleModelSpectrumChannel [class]
    21.6      module.add_class('SingleModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel'])
    21.7 +    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t')
    21.8 +    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*')
    21.9 +    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&')
   21.10      typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >', 'ns3::TxSpectrumModelInfoMap_t')
   21.11      typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >*', 'ns3::TxSpectrumModelInfoMap_t*')
   21.12      typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >&', 'ns3::TxSpectrumModelInfoMap_t&')
   21.13      typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >', 'ns3::RxSpectrumModelInfoMap_t')
   21.14      typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >*', 'ns3::RxSpectrumModelInfoMap_t*')
   21.15      typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >&', 'ns3::RxSpectrumModelInfoMap_t&')
   21.16 -    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t')
   21.17 -    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*')
   21.18 -    typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&')
   21.19      
   21.20      ## Register a nested module for the namespace Config
   21.21      
    22.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py	Wed Aug 18 13:58:38 2010 -0700
    22.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py	Wed Aug 18 13:58:50 2010 -0700
    22.3 @@ -27,12 +27,12 @@
    22.4      module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
    22.5      ## packet-data-calculators.h: ns3::PacketCounterCalculator [class]
    22.6      module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >'])
    22.7 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
    22.8 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*')
    22.9 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&')
   22.10      typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList')
   22.11      typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*')
   22.12      typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&')
   22.13 -    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
   22.14 -    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*')
   22.15 -    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&')
   22.16      
   22.17      ## Register a nested module for the namespace Config
   22.18      
    23.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py	Wed Aug 18 13:58:38 2010 -0700
    23.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py	Wed Aug 18 13:58:50 2010 -0700
    23.3 @@ -11,16 +11,16 @@
    23.4      module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'])
    23.5      ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration]
    23.6      module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_UNKNOWN'])
    23.7 +    ## qos-utils.h: ns3::AcIndex [enumeration]
    23.8 +    module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'])
    23.9 +    ## ctrl-headers.h: ns3::BlockAckType [enumeration]
   23.10 +    module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'])
   23.11      ## qos-tag.h: ns3::UserPriority [enumeration]
   23.12      module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
   23.13 -    ## qos-utils.h: ns3::AcIndex [enumeration]
   23.14 -    module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'])
   23.15 +    ## wifi-mode.h: ns3::WifiCodeRate [enumeration]
   23.16 +    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'])
   23.17      ## edca-txop-n.h: ns3::TypeOfStation [enumeration]
   23.18      module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA'])
   23.19 -    ## ctrl-headers.h: ns3::BlockAckType [enumeration]
   23.20 -    module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'])
   23.21 -    ## wifi-mode.h: ns3::WifiCodeRate [enumeration]
   23.22 -    module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2'])
   23.23      ## block-ack-manager.h: ns3::Bar [struct]
   23.24      module.add_class('Bar')
   23.25      ## block-ack-agreement.h: ns3::BlockAckAgreement [class]
   23.26 @@ -204,18 +204,18 @@
   23.27      ## dca-txop.h: ns3::DcaTxop [class]
   23.28      module.add_class('DcaTxop', parent=root_module['ns3::Dcf'])
   23.29      module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector')
   23.30 +    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
   23.31 +    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
   23.32 +    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
   23.33 +    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
   23.34 +    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
   23.35 +    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
   23.36      typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId')
   23.37      typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*')
   23.38      typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&')
   23.39 -    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator')
   23.40 -    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*')
   23.41 -    typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&')
   23.42      typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate')
   23.43      typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*')
   23.44      typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&')
   23.45 -    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList')
   23.46 -    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*')
   23.47 -    typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&')
   23.48      typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >', 'ns3::SampleRate')
   23.49      typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >*', 'ns3::SampleRate*')
   23.50      typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >&', 'ns3::SampleRate&')
    24.1 --- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Wed Aug 18 13:58:38 2010 -0700
    24.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Wed Aug 18 13:58:50 2010 -0700
    24.3 @@ -1406,9 +1406,9 @@
    24.4  
    24.5  def register_Ns3UanAddress_methods(root_module, cls):
    24.6      cls.add_binary_comparison_operator('!=')
    24.7 -    cls.add_binary_comparison_operator('<')
    24.8      cls.add_output_stream_operator()
    24.9      cls.add_binary_comparison_operator('==')
   24.10 +    cls.add_binary_comparison_operator('<')
   24.11      ## uan-address.h: ns3::UanAddress::UanAddress(ns3::UanAddress const & arg0) [copy constructor]
   24.12      cls.add_constructor([param('ns3::UanAddress const &', 'arg0')])
   24.13      ## uan-address.h: ns3::UanAddress::UanAddress() [constructor]