From fabd470c2917189e97748a26d8cd1dd1dedbebf5 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Thu, 19 May 2016 00:57:32 +0200 Subject: [PATCH] network: Rescan bindings --- src/network/bindings/modulegen__gcc_ILP32.py | 41 +++++++++++--------- src/network/bindings/modulegen__gcc_LP64.py | 41 +++++++++++--------- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/src/network/bindings/modulegen__gcc_ILP32.py b/src/network/bindings/modulegen__gcc_ILP32.py index a1b44ae5a..4abf2056f 100644 --- a/src/network/bindings/modulegen__gcc_ILP32.py +++ b/src/network/bindings/modulegen__gcc_ILP32.py @@ -837,8 +837,8 @@ def register_methods(root_module): def register_Ns3Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## address.h (module 'network'): ns3::Address::Address() [constructor] cls.add_constructor([]) @@ -1802,8 +1802,8 @@ def register_Ns3InetSocketAddress_methods(root_module, cls): def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')]) @@ -1983,8 +1983,8 @@ def register_Ns3Ipv4Mask_methods(root_module, cls): def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor] cls.add_constructor([]) @@ -2240,8 +2240,8 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): def register_Ns3Mac16Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')]) @@ -2277,8 +2277,8 @@ def register_Ns3Mac16Address_methods(root_module, cls): def register_Ns3Mac48Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')]) @@ -2349,8 +2349,8 @@ def register_Ns3Mac48Address_methods(root_module, cls): def register_Ns3Mac64Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac64Address const &', 'arg0')]) @@ -3664,8 +3664,8 @@ def register_Ns3TracedValue__Unsigned_int_methods(root_module, cls): def register_Ns3TypeId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor] cls.add_constructor([param('char const *', 'name')]) @@ -3883,6 +3883,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right')) + cls.add_output_stream_operator() cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) @@ -3893,7 +3894,6 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right')) cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right')) - cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor] @@ -4474,6 +4474,10 @@ def register_Ns3Queue_methods(root_module, cls): 'ns3::Ptr< ns3::QueueItem const >', [], is_const=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Remove() [member function] + cls.add_method('Remove', + 'ns3::Ptr< ns3::QueueItem >', + []) ## queue.h (module 'network'): void ns3::Queue::ResetStatistics() [member function] cls.add_method('ResetStatistics', 'void', @@ -4515,6 +4519,11 @@ def register_Ns3Queue_methods(root_module, cls): 'ns3::Ptr< ns3::QueueItem const >', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoRemove() [member function] + cls.add_method('DoRemove', + 'ns3::Ptr< ns3::QueueItem >', + [], + is_pure_virtual=True, visibility='private', is_virtual=True) return def register_Ns3RadiotapHeader_methods(root_module, cls): @@ -5682,6 +5691,7 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right')) + cls.add_output_stream_operator() cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) @@ -5689,7 +5699,6 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right')) - cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## nstime.h (module 'core'): ns3::Time::Time() [constructor] @@ -6679,6 +6688,11 @@ def register_Ns3DropTailQueue_methods(root_module, cls): 'ns3::Ptr< ns3::QueueItem const >', [], is_const=True, visibility='private', is_virtual=True) + ## drop-tail-queue.h (module 'network'): ns3::Ptr ns3::DropTailQueue::DoRemove() [member function] + cls.add_method('DoRemove', + 'ns3::Ptr< ns3::QueueItem >', + [], + visibility='private', is_virtual=True) return def register_Ns3EmpiricalRandomVariable_methods(root_module, cls): @@ -7790,15 +7804,6 @@ def register_Ns3NetDeviceQueueInterface_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) - ## net-device.h (module 'network'): bool ns3::NetDeviceQueueInterface::IsQueueDiscInstalled() const [member function] - cls.add_method('IsQueueDiscInstalled', - 'bool', - [], - is_const=True) - ## net-device.h (module 'network'): void ns3::NetDeviceQueueInterface::SetQueueDiscInstalled(bool installed) [member function] - cls.add_method('SetQueueDiscInstalled', - 'void', - [param('bool', 'installed')]) ## net-device.h (module 'network'): void ns3::NetDeviceQueueInterface::SetSelectQueueCallback(ns3::Callback, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> cb) [member function] cls.add_method('SetSelectQueueCallback', 'void', diff --git a/src/network/bindings/modulegen__gcc_LP64.py b/src/network/bindings/modulegen__gcc_LP64.py index a1b44ae5a..4abf2056f 100644 --- a/src/network/bindings/modulegen__gcc_LP64.py +++ b/src/network/bindings/modulegen__gcc_LP64.py @@ -837,8 +837,8 @@ def register_methods(root_module): def register_Ns3Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## address.h (module 'network'): ns3::Address::Address() [constructor] cls.add_constructor([]) @@ -1802,8 +1802,8 @@ def register_Ns3InetSocketAddress_methods(root_module, cls): def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')]) @@ -1983,8 +1983,8 @@ def register_Ns3Ipv4Mask_methods(root_module, cls): def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor] cls.add_constructor([]) @@ -2240,8 +2240,8 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): def register_Ns3Mac16Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## mac16-address.h (module 'network'): ns3::Mac16Address::Mac16Address(ns3::Mac16Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac16Address const &', 'arg0')]) @@ -2277,8 +2277,8 @@ def register_Ns3Mac16Address_methods(root_module, cls): def register_Ns3Mac48Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')]) @@ -2349,8 +2349,8 @@ def register_Ns3Mac48Address_methods(root_module, cls): def register_Ns3Mac64Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## mac64-address.h (module 'network'): ns3::Mac64Address::Mac64Address(ns3::Mac64Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac64Address const &', 'arg0')]) @@ -3664,8 +3664,8 @@ def register_Ns3TracedValue__Unsigned_int_methods(root_module, cls): def register_Ns3TypeId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor] cls.add_constructor([param('char const *', 'name')]) @@ -3883,6 +3883,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right')) + cls.add_output_stream_operator() cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) cls.add_binary_numeric_operator('+', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) cls.add_binary_numeric_operator('-', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) @@ -3893,7 +3894,6 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', u'right')) cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right')) - cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor] @@ -4474,6 +4474,10 @@ def register_Ns3Queue_methods(root_module, cls): 'ns3::Ptr< ns3::QueueItem const >', [], is_const=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Remove() [member function] + cls.add_method('Remove', + 'ns3::Ptr< ns3::QueueItem >', + []) ## queue.h (module 'network'): void ns3::Queue::ResetStatistics() [member function] cls.add_method('ResetStatistics', 'void', @@ -4515,6 +4519,11 @@ def register_Ns3Queue_methods(root_module, cls): 'ns3::Ptr< ns3::QueueItem const >', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoRemove() [member function] + cls.add_method('DoRemove', + 'ns3::Ptr< ns3::QueueItem >', + [], + is_pure_virtual=True, visibility='private', is_virtual=True) return def register_Ns3RadiotapHeader_methods(root_module, cls): @@ -5682,6 +5691,7 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right')) + cls.add_output_stream_operator() cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', u'right')) @@ -5689,7 +5699,6 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right')) - cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## nstime.h (module 'core'): ns3::Time::Time() [constructor] @@ -6679,6 +6688,11 @@ def register_Ns3DropTailQueue_methods(root_module, cls): 'ns3::Ptr< ns3::QueueItem const >', [], is_const=True, visibility='private', is_virtual=True) + ## drop-tail-queue.h (module 'network'): ns3::Ptr ns3::DropTailQueue::DoRemove() [member function] + cls.add_method('DoRemove', + 'ns3::Ptr< ns3::QueueItem >', + [], + visibility='private', is_virtual=True) return def register_Ns3EmpiricalRandomVariable_methods(root_module, cls): @@ -7790,15 +7804,6 @@ def register_Ns3NetDeviceQueueInterface_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) - ## net-device.h (module 'network'): bool ns3::NetDeviceQueueInterface::IsQueueDiscInstalled() const [member function] - cls.add_method('IsQueueDiscInstalled', - 'bool', - [], - is_const=True) - ## net-device.h (module 'network'): void ns3::NetDeviceQueueInterface::SetQueueDiscInstalled(bool installed) [member function] - cls.add_method('SetQueueDiscInstalled', - 'void', - [param('bool', 'installed')]) ## net-device.h (module 'network'): void ns3::NetDeviceQueueInterface::SetSelectQueueCallback(ns3::Callback, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> cb) [member function] cls.add_method('SetSelectQueueCallback', 'void',