View | Details | Raw Unified | Return to bug 1991
Collapse All | Expand All

(-)a/src/network/bindings/modulegen__gcc_ILP32.py (-13 / +13 lines)
 Lines 766-773    Link Here 
766
766
767
def register_Ns3Address_methods(root_module, cls):
767
def register_Ns3Address_methods(root_module, cls):
768
    cls.add_binary_comparison_operator('!=')
768
    cls.add_binary_comparison_operator('!=')
769
    cls.add_binary_comparison_operator('<')
769
    cls.add_output_stream_operator()
770
    cls.add_output_stream_operator()
770
    cls.add_binary_comparison_operator('<')
771
    cls.add_binary_comparison_operator('==')
771
    cls.add_binary_comparison_operator('==')
772
    ## address.h (module 'network'): ns3::Address::Address() [constructor]
772
    ## address.h (module 'network'): ns3::Address::Address() [constructor]
773
    cls.add_constructor([])
773
    cls.add_constructor([])
 Lines 1737-1744    Link Here 
1737
1737
1738
def register_Ns3Ipv4Address_methods(root_module, cls):
1738
def register_Ns3Ipv4Address_methods(root_module, cls):
1739
    cls.add_binary_comparison_operator('!=')
1739
    cls.add_binary_comparison_operator('!=')
1740
    cls.add_binary_comparison_operator('<')
1740
    cls.add_output_stream_operator()
1741
    cls.add_output_stream_operator()
1741
    cls.add_binary_comparison_operator('<')
1742
    cls.add_binary_comparison_operator('==')
1742
    cls.add_binary_comparison_operator('==')
1743
    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
1743
    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
1744
    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
1744
    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
 Lines 1908-1915    Link Here 
1908
1908
1909
def register_Ns3Ipv6Address_methods(root_module, cls):
1909
def register_Ns3Ipv6Address_methods(root_module, cls):
1910
    cls.add_binary_comparison_operator('!=')
1910
    cls.add_binary_comparison_operator('!=')
1911
    cls.add_binary_comparison_operator('<')
1911
    cls.add_output_stream_operator()
1912
    cls.add_output_stream_operator()
1912
    cls.add_binary_comparison_operator('<')
1913
    cls.add_binary_comparison_operator('==')
1913
    cls.add_binary_comparison_operator('==')
1914
    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
1914
    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
1915
    cls.add_constructor([])
1915
    cls.add_constructor([])
 Lines 2165-2172    Link Here 
2165
2165
2166
def register_Ns3Mac16Address_methods(root_module, cls):
2166
def register_Ns3Mac16Address_methods(root_module, cls):
2167
    cls.add_binary_comparison_operator('!=')
2167
    cls.add_binary_comparison_operator('!=')
2168
    cls.add_binary_comparison_operator('<')
2168
    cls.add_output_stream_operator()
2169
    cls.add_output_stream_operator()
2169
    cls.add_binary_comparison_operator('<')
2170
    cls.add_binary_comparison_operator('==')
2170
    cls.add_binary_comparison_operator('==')
2171
    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor]
2171
    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor]
2172
    cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')])
2172
    cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')])
 Lines 2202-2209    Link Here 
2202
2202
2203
def register_Ns3Mac48Address_methods(root_module, cls):
2203
def register_Ns3Mac48Address_methods(root_module, cls):
2204
    cls.add_binary_comparison_operator('!=')
2204
    cls.add_binary_comparison_operator('!=')
2205
    cls.add_binary_comparison_operator('<')
2205
    cls.add_output_stream_operator()
2206
    cls.add_output_stream_operator()
2206
    cls.add_binary_comparison_operator('<')
2207
    cls.add_binary_comparison_operator('==')
2207
    cls.add_binary_comparison_operator('==')
2208
    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
2208
    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
2209
    cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
2209
    cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
 Lines 2274-2281    Link Here 
2274
2274
2275
def register_Ns3Mac64Address_methods(root_module, cls):
2275
def register_Ns3Mac64Address_methods(root_module, cls):
2276
    cls.add_binary_comparison_operator('!=')
2276
    cls.add_binary_comparison_operator('!=')
2277
    cls.add_binary_comparison_operator('<')
2277
    cls.add_output_stream_operator()
2278
    cls.add_output_stream_operator()
2278
    cls.add_binary_comparison_operator('<')
2279
    cls.add_binary_comparison_operator('==')
2279
    cls.add_binary_comparison_operator('==')
2280
    ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor]
2280
    ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor]
2281
    cls.add_constructor([param('ns3::Mac64Address const &', 'arg0')])
2281
    cls.add_constructor([param('ns3::Mac64Address const &', 'arg0')])
 Lines 3124-3133    Link Here 
3124
    cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')])
3124
    cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')])
3125
    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper() [constructor]
3125
    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper() [constructor]
3126
    cls.add_constructor([])
3126
    cls.add_constructor([])
3127
    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::PcapFileWrapper> ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function]
3127
    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::PcapFileWrapper> ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits<unsigned int>::max(), int32_t tzCorrection=0) [member function]
3128
    cls.add_method('CreateFile', 
3128
    cls.add_method('CreateFile', 
3129
                   'ns3::Ptr< ns3::PcapFileWrapper >', 
3129
                   'ns3::Ptr< ns3::PcapFileWrapper >', 
3130
                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')])
3130
                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='0')])
3131
    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
3131
    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
3132
    cls.add_method('GetFilenameFromDevice', 
3132
    cls.add_method('GetFilenameFromDevice', 
3133
                   'std::string', 
3133
                   'std::string', 
 Lines 3545-3552    Link Here 
3545
3545
3546
def register_Ns3TypeId_methods(root_module, cls):
3546
def register_Ns3TypeId_methods(root_module, cls):
3547
    cls.add_binary_comparison_operator('!=')
3547
    cls.add_binary_comparison_operator('!=')
3548
    cls.add_binary_comparison_operator('<')
3548
    cls.add_output_stream_operator()
3549
    cls.add_output_stream_operator()
3549
    cls.add_binary_comparison_operator('<')
3550
    cls.add_binary_comparison_operator('==')
3550
    cls.add_binary_comparison_operator('==')
3551
    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
3551
    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
3552
    cls.add_constructor([param('char const *', 'name')])
3552
    cls.add_constructor([param('char const *', 'name')])
 Lines 3740-3749    Link Here 
3740
    return
3740
    return
3741
3741
3742
def register_Ns3Int64x64_t_methods(root_module, cls):
3742
def register_Ns3Int64x64_t_methods(root_module, cls):
3743
    cls.add_binary_comparison_operator('<=')
3744
    cls.add_binary_comparison_operator('!=')
3743
    cls.add_binary_comparison_operator('!=')
3745
    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right'))
3744
    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right'))
3746
    cls.add_output_stream_operator()
3747
    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3745
    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3748
    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3746
    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3749
    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3747
    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
 Lines 3754-3759    Link Here 
3754
    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right'))
3752
    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right'))
3755
    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right'))
3753
    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right'))
3756
    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right'))
3754
    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right'))
3755
    cls.add_output_stream_operator()
3756
    cls.add_binary_comparison_operator('<=')
3757
    cls.add_binary_comparison_operator('==')
3757
    cls.add_binary_comparison_operator('==')
3758
    cls.add_binary_comparison_operator('>=')
3758
    cls.add_binary_comparison_operator('>=')
3759
    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
3759
    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
 Lines 5385-5394    Link Here 
5385
    return
5385
    return
5386
5386
5387
def register_Ns3Time_methods(root_module, cls):
5387
def register_Ns3Time_methods(root_module, cls):
5388
    cls.add_binary_comparison_operator('<=')
5389
    cls.add_binary_comparison_operator('!=')
5388
    cls.add_binary_comparison_operator('!=')
5390
    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right'))
5389
    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right'))
5391
    cls.add_output_stream_operator()
5392
    cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right'))
5390
    cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right'))
5393
    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
5391
    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
5394
    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
5392
    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
 Lines 5396-5401    Link Here 
5396
    cls.add_binary_comparison_operator('<')
5394
    cls.add_binary_comparison_operator('<')
5397
    cls.add_binary_comparison_operator('>')
5395
    cls.add_binary_comparison_operator('>')
5398
    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right'))
5396
    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right'))
5397
    cls.add_output_stream_operator()
5398
    cls.add_binary_comparison_operator('<=')
5399
    cls.add_binary_comparison_operator('==')
5399
    cls.add_binary_comparison_operator('==')
5400
    cls.add_binary_comparison_operator('>=')
5400
    cls.add_binary_comparison_operator('>=')
5401
    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
5401
    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
(-)a/src/network/bindings/modulegen__gcc_LP64.py (-13 / +13 lines)
 Lines 766-773    Link Here 
766
766
767
def register_Ns3Address_methods(root_module, cls):
767
def register_Ns3Address_methods(root_module, cls):
768
    cls.add_binary_comparison_operator('!=')
768
    cls.add_binary_comparison_operator('!=')
769
    cls.add_binary_comparison_operator('<')
769
    cls.add_output_stream_operator()
770
    cls.add_output_stream_operator()
770
    cls.add_binary_comparison_operator('<')
771
    cls.add_binary_comparison_operator('==')
771
    cls.add_binary_comparison_operator('==')
772
    ## address.h (module 'network'): ns3::Address::Address() [constructor]
772
    ## address.h (module 'network'): ns3::Address::Address() [constructor]
773
    cls.add_constructor([])
773
    cls.add_constructor([])
 Lines 1737-1744    Link Here 
1737
1737
1738
def register_Ns3Ipv4Address_methods(root_module, cls):
1738
def register_Ns3Ipv4Address_methods(root_module, cls):
1739
    cls.add_binary_comparison_operator('!=')
1739
    cls.add_binary_comparison_operator('!=')
1740
    cls.add_binary_comparison_operator('<')
1740
    cls.add_output_stream_operator()
1741
    cls.add_output_stream_operator()
1741
    cls.add_binary_comparison_operator('<')
1742
    cls.add_binary_comparison_operator('==')
1742
    cls.add_binary_comparison_operator('==')
1743
    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
1743
    ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor]
1744
    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
1744
    cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')])
 Lines 1908-1915    Link Here 
1908
1908
1909
def register_Ns3Ipv6Address_methods(root_module, cls):
1909
def register_Ns3Ipv6Address_methods(root_module, cls):
1910
    cls.add_binary_comparison_operator('!=')
1910
    cls.add_binary_comparison_operator('!=')
1911
    cls.add_binary_comparison_operator('<')
1911
    cls.add_output_stream_operator()
1912
    cls.add_output_stream_operator()
1912
    cls.add_binary_comparison_operator('<')
1913
    cls.add_binary_comparison_operator('==')
1913
    cls.add_binary_comparison_operator('==')
1914
    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
1914
    ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor]
1915
    cls.add_constructor([])
1915
    cls.add_constructor([])
 Lines 2165-2172    Link Here 
2165
2165
2166
def register_Ns3Mac16Address_methods(root_module, cls):
2166
def register_Ns3Mac16Address_methods(root_module, cls):
2167
    cls.add_binary_comparison_operator('!=')
2167
    cls.add_binary_comparison_operator('!=')
2168
    cls.add_binary_comparison_operator('<')
2168
    cls.add_output_stream_operator()
2169
    cls.add_output_stream_operator()
2169
    cls.add_binary_comparison_operator('<')
2170
    cls.add_binary_comparison_operator('==')
2170
    cls.add_binary_comparison_operator('==')
2171
    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor]
2171
    ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor]
2172
    cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')])
2172
    cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')])
 Lines 2202-2209    Link Here 
2202
2202
2203
def register_Ns3Mac48Address_methods(root_module, cls):
2203
def register_Ns3Mac48Address_methods(root_module, cls):
2204
    cls.add_binary_comparison_operator('!=')
2204
    cls.add_binary_comparison_operator('!=')
2205
    cls.add_binary_comparison_operator('<')
2205
    cls.add_output_stream_operator()
2206
    cls.add_output_stream_operator()
2206
    cls.add_binary_comparison_operator('<')
2207
    cls.add_binary_comparison_operator('==')
2207
    cls.add_binary_comparison_operator('==')
2208
    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
2208
    ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor]
2209
    cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
2209
    cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')])
 Lines 2274-2281    Link Here 
2274
2274
2275
def register_Ns3Mac64Address_methods(root_module, cls):
2275
def register_Ns3Mac64Address_methods(root_module, cls):
2276
    cls.add_binary_comparison_operator('!=')
2276
    cls.add_binary_comparison_operator('!=')
2277
    cls.add_binary_comparison_operator('<')
2277
    cls.add_output_stream_operator()
2278
    cls.add_output_stream_operator()
2278
    cls.add_binary_comparison_operator('<')
2279
    cls.add_binary_comparison_operator('==')
2279
    cls.add_binary_comparison_operator('==')
2280
    ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor]
2280
    ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor]
2281
    cls.add_constructor([param('ns3::Mac64Address const &', 'arg0')])
2281
    cls.add_constructor([param('ns3::Mac64Address const &', 'arg0')])
 Lines 3124-3133    Link Here 
3124
    cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')])
3124
    cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')])
3125
    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper() [constructor]
3125
    ## trace-helper.h (module 'network'): ns3::PcapHelper::PcapHelper() [constructor]
3126
    cls.add_constructor([])
3126
    cls.add_constructor([])
3127
    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::PcapFileWrapper> ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function]
3127
    ## trace-helper.h (module 'network'): ns3::Ptr<ns3::PcapFileWrapper> ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits<unsigned int>::max(), int32_t tzCorrection=0) [member function]
3128
    cls.add_method('CreateFile', 
3128
    cls.add_method('CreateFile', 
3129
                   'ns3::Ptr< ns3::PcapFileWrapper >', 
3129
                   'ns3::Ptr< ns3::PcapFileWrapper >', 
3130
                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')])
3130
                   [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits<unsigned int>::max()'), param('int32_t', 'tzCorrection', default_value='0')])
3131
    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
3131
    ## trace-helper.h (module 'network'): std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
3132
    cls.add_method('GetFilenameFromDevice', 
3132
    cls.add_method('GetFilenameFromDevice', 
3133
                   'std::string', 
3133
                   'std::string', 
 Lines 3545-3552    Link Here 
3545
3545
3546
def register_Ns3TypeId_methods(root_module, cls):
3546
def register_Ns3TypeId_methods(root_module, cls):
3547
    cls.add_binary_comparison_operator('!=')
3547
    cls.add_binary_comparison_operator('!=')
3548
    cls.add_binary_comparison_operator('<')
3548
    cls.add_output_stream_operator()
3549
    cls.add_output_stream_operator()
3549
    cls.add_binary_comparison_operator('<')
3550
    cls.add_binary_comparison_operator('==')
3550
    cls.add_binary_comparison_operator('==')
3551
    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
3551
    ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor]
3552
    cls.add_constructor([param('char const *', 'name')])
3552
    cls.add_constructor([param('char const *', 'name')])
 Lines 3740-3749    Link Here 
3740
    return
3740
    return
3741
3741
3742
def register_Ns3Int64x64_t_methods(root_module, cls):
3742
def register_Ns3Int64x64_t_methods(root_module, cls):
3743
    cls.add_binary_comparison_operator('<=')
3744
    cls.add_binary_comparison_operator('!=')
3743
    cls.add_binary_comparison_operator('!=')
3745
    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right'))
3744
    cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right'))
3746
    cls.add_output_stream_operator()
3747
    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3745
    cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3748
    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3746
    cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3749
    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
3747
    cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right'))
 Lines 3754-3759    Link Here 
3754
    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right'))
3752
    cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right'))
3755
    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right'))
3753
    cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right'))
3756
    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right'))
3754
    cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right'))
3755
    cls.add_output_stream_operator()
3756
    cls.add_binary_comparison_operator('<=')
3757
    cls.add_binary_comparison_operator('==')
3757
    cls.add_binary_comparison_operator('==')
3758
    cls.add_binary_comparison_operator('>=')
3758
    cls.add_binary_comparison_operator('>=')
3759
    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
3759
    ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
 Lines 5385-5394    Link Here 
5385
    return
5385
    return
5386
5386
5387
def register_Ns3Time_methods(root_module, cls):
5387
def register_Ns3Time_methods(root_module, cls):
5388
    cls.add_binary_comparison_operator('<=')
5389
    cls.add_binary_comparison_operator('!=')
5388
    cls.add_binary_comparison_operator('!=')
5390
    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right'))
5389
    cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right'))
5391
    cls.add_output_stream_operator()
5392
    cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right'))
5390
    cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right'))
5393
    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
5391
    cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
5394
    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
5392
    cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right'))
 Lines 5396-5401    Link Here 
5396
    cls.add_binary_comparison_operator('<')
5394
    cls.add_binary_comparison_operator('<')
5397
    cls.add_binary_comparison_operator('>')
5395
    cls.add_binary_comparison_operator('>')
5398
    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right'))
5396
    cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right'))
5397
    cls.add_output_stream_operator()
5398
    cls.add_binary_comparison_operator('<=')
5399
    cls.add_binary_comparison_operator('==')
5399
    cls.add_binary_comparison_operator('==')
5400
    cls.add_binary_comparison_operator('>=')
5400
    cls.add_binary_comparison_operator('>=')
5401
    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
5401
    ## nstime.h (module 'core'): ns3::Time::Time() [constructor]
(-)a/src/network/helper/trace-helper.h (-1 / +1 lines)
 Lines 100-106    Link Here 
100
   * @returns a smart pointer to the Pcap file
100
   * @returns a smart pointer to the Pcap file
101
   */
101
   */
102
  Ptr<PcapFileWrapper> CreateFile (std::string filename, std::ios::openmode filemode,
102
  Ptr<PcapFileWrapper> CreateFile (std::string filename, std::ios::openmode filemode,
103
                                   uint32_t dataLinkType,  uint32_t snapLen = 65535, int32_t tzCorrection = 0);
103
                                   uint32_t dataLinkType,  uint32_t snapLen = std::numeric_limits<uint32_t>::max (), int32_t tzCorrection = 0);
104
  /**
104
  /**
105
   * @brief Hook a trace source to the default trace sink
105
   * @brief Hook a trace source to the default trace sink
106
   * 
106
   * 

Return to bug 1991