From e7f2786186c5be040b2a620bd93b33fcd46b7f35 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sun, 22 Oct 2017 13:38:42 -0700 Subject: [PATCH] energy, wifi: Rescan bindings --- src/energy/bindings/modulegen__gcc_ILP32.py | 17 +++------ src/energy/bindings/modulegen__gcc_LP64.py | 17 +++------ src/wifi/bindings/modulegen__gcc_ILP32.py | 38 --------------------- src/wifi/bindings/modulegen__gcc_LP64.py | 38 --------------------- 4 files changed, 8 insertions(+), 102 deletions(-) diff --git a/src/energy/bindings/modulegen__gcc_ILP32.py b/src/energy/bindings/modulegen__gcc_ILP32.py index a86ce5143..f3c3e2247 100644 --- a/src/energy/bindings/modulegen__gcc_ILP32.py +++ b/src/energy/bindings/modulegen__gcc_ILP32.py @@ -1640,7 +1640,7 @@ def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_method('IsAllHostsMulticast', 'bool', [], - is_const=True) + deprecated=True, is_const=True) ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function] cls.add_method('IsAllNodesMulticast', 'bool', @@ -2508,7 +2508,8 @@ def register_Ns3TypeId_methods(root_module, cls): ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor) [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', - [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')]) + [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')], + deprecated=True) ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor, std::string callback, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SupportLevel::SUPPORTED, std::string const & supportMsg="") [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', @@ -3879,11 +3880,6 @@ def register_Ns3DeviceEnergyModel_methods(root_module, cls): 'double', [], is_const=True) - ## device-energy-model.h (module 'energy'): double ns3::DeviceEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_pure_virtual=True, is_const=True, is_virtual=True) ## device-energy-model.h (module 'energy'): static ns3::TypeId ns3::DeviceEnergyModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -5435,7 +5431,7 @@ def register_Ns3ParetoRandomVariable_methods(root_module, cls): cls.add_method('GetMean', 'double', [], - is_const=True) + deprecated=True, is_const=True) ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetScale() const [member function] cls.add_method('GetScale', 'double', @@ -5596,11 +5592,6 @@ def register_Ns3SimpleDeviceEnergyModel_methods(root_module, cls): 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True) - ## simple-device-energy-model.h (module 'energy'): double ns3::SimpleDeviceEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_const=True, is_virtual=True) ## simple-device-energy-model.h (module 'energy'): static ns3::TypeId ns3::SimpleDeviceEnergyModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', diff --git a/src/energy/bindings/modulegen__gcc_LP64.py b/src/energy/bindings/modulegen__gcc_LP64.py index a86ce5143..f3c3e2247 100644 --- a/src/energy/bindings/modulegen__gcc_LP64.py +++ b/src/energy/bindings/modulegen__gcc_LP64.py @@ -1640,7 +1640,7 @@ def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_method('IsAllHostsMulticast', 'bool', [], - is_const=True) + deprecated=True, is_const=True) ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function] cls.add_method('IsAllNodesMulticast', 'bool', @@ -2508,7 +2508,8 @@ def register_Ns3TypeId_methods(root_module, cls): ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor) [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', - [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')]) + [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')], + deprecated=True) ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr accessor, std::string callback, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SupportLevel::SUPPORTED, std::string const & supportMsg="") [member function] cls.add_method('AddTraceSource', 'ns3::TypeId', @@ -3879,11 +3880,6 @@ def register_Ns3DeviceEnergyModel_methods(root_module, cls): 'double', [], is_const=True) - ## device-energy-model.h (module 'energy'): double ns3::DeviceEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_pure_virtual=True, is_const=True, is_virtual=True) ## device-energy-model.h (module 'energy'): static ns3::TypeId ns3::DeviceEnergyModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -5435,7 +5431,7 @@ def register_Ns3ParetoRandomVariable_methods(root_module, cls): cls.add_method('GetMean', 'double', [], - is_const=True) + deprecated=True, is_const=True) ## random-variable-stream.h (module 'core'): double ns3::ParetoRandomVariable::GetScale() const [member function] cls.add_method('GetScale', 'double', @@ -5596,11 +5592,6 @@ def register_Ns3SimpleDeviceEnergyModel_methods(root_module, cls): 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True) - ## simple-device-energy-model.h (module 'energy'): double ns3::SimpleDeviceEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_const=True, is_virtual=True) ## simple-device-energy-model.h (module 'energy'): static ns3::TypeId ns3::SimpleDeviceEnergyModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', diff --git a/src/wifi/bindings/modulegen__gcc_ILP32.py b/src/wifi/bindings/modulegen__gcc_ILP32.py index d7773ffce..4e825846b 100644 --- a/src/wifi/bindings/modulegen__gcc_ILP32.py +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py @@ -8381,11 +8381,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): 'ns3::TypeId', [], is_const=True, is_virtual=True) - ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::QosAckPolicy ns3::WifiMacHeader::GetQosAckPolicy() const [member function] - cls.add_method('GetQosAckPolicy', - 'ns3::WifiMacHeader::QosAckPolicy', - [], - is_const=True) ## wifi-mac-header.h (module 'wifi'): uint8_t ns3::WifiMacHeader::GetQosTid() const [member function] cls.add_method('GetQosTid', 'uint8_t', @@ -8396,11 +8391,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): 'uint8_t', [], is_const=True) - ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetRawDuration() const [member function] - cls.add_method('GetRawDuration', - 'uint16_t', - [], - is_const=True) ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetSequenceControl() const [member function] cls.add_method('GetSequenceControl', 'uint16_t', @@ -8709,10 +8699,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosAmsdu', 'void', []) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosBlockAck() [member function] - cls.add_method('SetQosBlockAck', - 'void', - []) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosEosp() [member function] cls.add_method('SetQosEosp', 'void', @@ -8721,10 +8707,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosMeshControlPresent', 'void', []) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAck() [member function] - cls.add_method('SetQosNoAck', - 'void', - []) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAmsdu() [member function] cls.add_method('SetQosNoAmsdu', 'void', @@ -8737,10 +8719,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosNoMeshControlPresent', 'void', []) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNormalAck() [member function] - cls.add_method('SetQosNormalAck', - 'void', - []) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosTid(uint8_t tid) [member function] cls.add_method('SetQosTid', 'void', @@ -8749,10 +8727,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosTxopLimit', 'void', [param('uint8_t', 'txop')]) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRawDuration(uint16_t duration) [member function] - cls.add_method('SetRawDuration', - 'void', - [param('uint16_t', 'duration')]) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRetry() [member function] cls.add_method('SetRetry', 'void', @@ -13119,11 +13093,6 @@ def register_Ns3DeviceEnergyModel_methods(root_module, cls): 'double', [], is_const=True) - ## device-energy-model.h (module 'energy'): double ns3::DeviceEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_pure_virtual=True, is_const=True, is_virtual=True) ## device-energy-model.h (module 'energy'): static ns3::TypeId ns3::DeviceEnergyModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -18415,8 +18384,6 @@ def register_Ns3Ssid_methods(root_module, cls): cls.add_constructor([]) ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(std::string s) [constructor] cls.add_constructor([param('std::string', 's')]) - ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(char const * ssid, uint8_t length) [constructor] - cls.add_constructor([param('char const *', 'ssid'), param('uint8_t', 'length')]) ## ssid.h (module 'wifi'): uint8_t ns3::Ssid::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function] cls.add_method('DeserializeInformationField', 'uint8_t', @@ -19504,11 +19471,6 @@ def register_Ns3WifiRadioEnergyModel_methods(root_module, cls): 'double', [], is_const=True) - ## wifi-radio-energy-model.h (module 'wifi'): double ns3::WifiRadioEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_const=True, is_virtual=True) ## wifi-radio-energy-model.h (module 'wifi'): double ns3::WifiRadioEnergyModel::GetTxCurrentA() const [member function] cls.add_method('GetTxCurrentA', 'double', diff --git a/src/wifi/bindings/modulegen__gcc_LP64.py b/src/wifi/bindings/modulegen__gcc_LP64.py index ea0b070c7..aff3f041b 100644 --- a/src/wifi/bindings/modulegen__gcc_LP64.py +++ b/src/wifi/bindings/modulegen__gcc_LP64.py @@ -8381,11 +8381,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): 'ns3::TypeId', [], is_const=True, is_virtual=True) - ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacHeader::QosAckPolicy ns3::WifiMacHeader::GetQosAckPolicy() const [member function] - cls.add_method('GetQosAckPolicy', - 'ns3::WifiMacHeader::QosAckPolicy', - [], - is_const=True) ## wifi-mac-header.h (module 'wifi'): uint8_t ns3::WifiMacHeader::GetQosTid() const [member function] cls.add_method('GetQosTid', 'uint8_t', @@ -8396,11 +8391,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): 'uint8_t', [], is_const=True) - ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetRawDuration() const [member function] - cls.add_method('GetRawDuration', - 'uint16_t', - [], - is_const=True) ## wifi-mac-header.h (module 'wifi'): uint16_t ns3::WifiMacHeader::GetSequenceControl() const [member function] cls.add_method('GetSequenceControl', 'uint16_t', @@ -8709,10 +8699,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosAmsdu', 'void', []) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosBlockAck() [member function] - cls.add_method('SetQosBlockAck', - 'void', - []) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosEosp() [member function] cls.add_method('SetQosEosp', 'void', @@ -8721,10 +8707,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosMeshControlPresent', 'void', []) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAck() [member function] - cls.add_method('SetQosNoAck', - 'void', - []) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNoAmsdu() [member function] cls.add_method('SetQosNoAmsdu', 'void', @@ -8737,10 +8719,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosNoMeshControlPresent', 'void', []) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosNormalAck() [member function] - cls.add_method('SetQosNormalAck', - 'void', - []) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosTid(uint8_t tid) [member function] cls.add_method('SetQosTid', 'void', @@ -8749,10 +8727,6 @@ def register_Ns3WifiMacHeader_methods(root_module, cls): cls.add_method('SetQosTxopLimit', 'void', [param('uint8_t', 'txop')]) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRawDuration(uint16_t duration) [member function] - cls.add_method('SetRawDuration', - 'void', - [param('uint16_t', 'duration')]) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetRetry() [member function] cls.add_method('SetRetry', 'void', @@ -13119,11 +13093,6 @@ def register_Ns3DeviceEnergyModel_methods(root_module, cls): 'double', [], is_const=True) - ## device-energy-model.h (module 'energy'): double ns3::DeviceEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_pure_virtual=True, is_const=True, is_virtual=True) ## device-energy-model.h (module 'energy'): static ns3::TypeId ns3::DeviceEnergyModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -18415,8 +18384,6 @@ def register_Ns3Ssid_methods(root_module, cls): cls.add_constructor([]) ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(std::string s) [constructor] cls.add_constructor([param('std::string', 's')]) - ## ssid.h (module 'wifi'): ns3::Ssid::Ssid(char const * ssid, uint8_t length) [constructor] - cls.add_constructor([param('char const *', 'ssid'), param('uint8_t', 'length')]) ## ssid.h (module 'wifi'): uint8_t ns3::Ssid::DeserializeInformationField(ns3::Buffer::Iterator start, uint8_t length) [member function] cls.add_method('DeserializeInformationField', 'uint8_t', @@ -19504,11 +19471,6 @@ def register_Ns3WifiRadioEnergyModel_methods(root_module, cls): 'double', [], is_const=True) - ## wifi-radio-energy-model.h (module 'wifi'): double ns3::WifiRadioEnergyModel::GetTotalEnergyConsumption() const [member function] - cls.add_method('GetTotalEnergyConsumption', - 'double', - [], - is_const=True, is_virtual=True) ## wifi-radio-energy-model.h (module 'wifi'): double ns3::WifiRadioEnergyModel::GetTxCurrentA() const [member function] cls.add_method('GetTxCurrentA', 'double',