diff -r 0daa97dec8db -r 2f6018cfe926 src/mesh/bindings/modulegen__gcc_ILP32.py --- a/src/mesh/bindings/modulegen__gcc_ILP32.py Sun Dec 15 22:58:10 2013 -0800 +++ b/src/mesh/bindings/modulegen__gcc_ILP32.py Mon Dec 16 00:06:41 2013 -0800 @@ -33,7 +33,7 @@ ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration] module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi') ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration] - module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA'], import_from_module='ns.wifi') + module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi') ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration] module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'], import_from_module='ns.wifi') ## address.h (module 'network'): ns3::Address [class] @@ -157,7 +157,7 @@ ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct] module.add_class('TraceSourceInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId']) ## wifi-helper.h (module 'wifi'): ns3::WifiHelper [class] - module.add_class('WifiHelper', import_from_module='ns.wifi') + module.add_class('WifiHelper', allow_subclassing=True, import_from_module='ns.wifi') ## wifi-helper.h (module 'wifi'): ns3::WifiMacHelper [class] module.add_class('WifiMacHelper', allow_subclassing=True, import_from_module='ns.wifi') ## wifi-mode.h (module 'wifi'): ns3::WifiMode [class] @@ -237,7 +237,7 @@ ## nstime.h (module 'core'): ns3::Time [class] module.add_class('Time', import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time::Unit [enumeration] - module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core') + module.add_enum('Unit', ['Y', 'D', 'H', 'MIN', 'S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time [class] root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t']) ## trace-source-accessor.h (module 'core'): ns3::TraceSourceAccessor [class] @@ -247,7 +247,7 @@ ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader [class] module.add_class('WifiActionHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header']) ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue [enumeration] - module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi') + module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi') ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PeerLinkMgtActionValue [enumeration] module.add_enum('PeerLinkMgtActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi') ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::LinkMetricActionValue [enumeration] @@ -1988,10 +1988,11 @@ 'bool', [param('ns3::Ipv6Address const &', 'other')], is_const=True) - ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() [member function] + ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsIpv4MappedAddress() const [member function] cls.add_method('IsIpv4MappedAddress', 'bool', - []) + [], + is_const=True) ## ipv6-address.h (module 'network'): bool ns3::Ipv6Address::IsLinkLocal() const [member function] cls.add_method('IsLinkLocal', 'bool', @@ -3326,17 +3327,17 @@ cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::NodeContainer', 'c')], - is_const=True) + is_const=True, is_virtual=True) ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, ns3::Ptr node) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('ns3::Ptr< ns3::Node >', 'node')], - is_const=True) + is_const=True, is_virtual=True) ## wifi-helper.h (module 'wifi'): ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, ns3::WifiMacHelper const & mac, std::string nodeName) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], - is_const=True) + is_const=True, is_virtual=True) ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetRemoteStationManager(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function] cls.add_method('SetRemoteStationManager', 'void', @@ -3344,7 +3345,8 @@ ## wifi-helper.h (module 'wifi'): void ns3::WifiHelper::SetStandard(ns3::WifiPhyStandard standard) [member function] cls.add_method('SetStandard', 'void', - [param('ns3::WifiPhyStandard', 'standard')]) + [param('ns3::WifiPhyStandard', 'standard')], + is_virtual=True) return def register_Ns3WifiMacHelper_methods(root_module, cls): @@ -3540,8 +3542,8 @@ cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')]) ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor] cls.add_constructor([]) - ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode m, uint8_t l, uint8_t r, bool sg, uint8_t ns, uint8_t ne, bool Stbc) [constructor] - cls.add_constructor([param('ns3::WifiMode', 'm'), param('uint8_t', 'l'), param('uint8_t', 'r'), param('bool', 'sg'), param('uint8_t', 'ns'), param('uint8_t', 'ne'), param('bool', 'Stbc')]) + ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, uint8_t retries, bool shortGuardInterval, uint8_t nss, uint8_t ness, bool stbc) [constructor] + cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('uint8_t', 'retries'), param('bool', 'shortGuardInterval'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('bool', 'stbc')]) ## wifi-tx-vector.h (module 'wifi'): ns3::WifiMode ns3::WifiTxVector::GetMode() const [member function] cls.add_method('GetMode', 'ns3::WifiMode', @@ -3597,10 +3599,10 @@ cls.add_method('SetShortGuardInterval', 'void', [param('bool', 'guardinterval')]) - ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbcsatuts) [member function] + ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetStbc(bool stbc) [member function] cls.add_method('SetStbc', 'void', - [param('bool', 'stbcsatuts')]) + [param('bool', 'stbc')]) ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetTxPowerLevel(uint8_t powerlevel) [member function] cls.add_method('SetTxPowerLevel', 'void', @@ -4670,6 +4672,11 @@ 'ns3::Time', [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')], is_static=True) + ## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function] + cls.add_method('GetDays', + 'double', + [], + is_const=True) ## nstime.h (module 'core'): double ns3::Time::GetDouble() const [member function] cls.add_method('GetDouble', 'double', @@ -4680,6 +4687,11 @@ 'int64_t', [], is_const=True) + ## nstime.h (module 'core'): double ns3::Time::GetHours() const [member function] + cls.add_method('GetHours', + 'double', + [], + is_const=True) ## nstime.h (module 'core'): int64_t ns3::Time::GetInteger() const [member function] cls.add_method('GetInteger', 'int64_t', @@ -4695,6 +4707,11 @@ 'int64_t', [], is_const=True) + ## nstime.h (module 'core'): double ns3::Time::GetMinutes() const [member function] + cls.add_method('GetMinutes', + 'double', + [], + is_const=True) ## nstime.h (module 'core'): int64_t ns3::Time::GetNanoSeconds() const [member function] cls.add_method('GetNanoSeconds', 'int64_t', @@ -4720,6 +4737,11 @@ 'int64_t', [], is_const=True) + ## nstime.h (module 'core'): double ns3::Time::GetYears() const [member function] + cls.add_method('GetYears', + 'double', + [], + is_const=True) ## nstime.h (module 'core'): bool ns3::Time::IsNegative() const [member function] cls.add_method('IsNegative', 'bool', @@ -5616,10 +5638,10 @@ cls.add_method('SetProbeResp', 'void', []) - ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy arg0) [member function] + ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAckPolicy(ns3::WifiMacHeader::QosAckPolicy policy) [member function] cls.add_method('SetQosAckPolicy', 'void', - [param('ns3::WifiMacHeader::QosAckPolicy', 'arg0')]) + [param('ns3::WifiMacHeader::QosAckPolicy', 'policy')]) ## wifi-mac-header.h (module 'wifi'): void ns3::WifiMacHeader::SetQosAmsdu() [member function] cls.add_method('SetQosAmsdu', 'void', @@ -6295,15 +6317,15 @@ 'void', [param('bool', 'greenfield')], is_pure_virtual=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool GuardInterval) [member function] + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetGuardInterval(bool guardInterval) [member function] cls.add_method('SetGuardInterval', 'void', - [param('bool', 'GuardInterval')], + [param('bool', 'guardInterval')], is_pure_virtual=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool Ldpc) [member function] + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetLdpc(bool ldpc) [member function] cls.add_method('SetLdpc', 'void', - [param('bool', 'Ldpc')], + [param('bool', 'ldpc')], is_pure_virtual=True, is_virtual=True) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetNumberOfReceiveAntennas(uint32_t rx) [member function] cls.add_method('SetNumberOfReceiveAntennas', @@ -7205,10 +7227,10 @@ 'void', [param('ns3::Buffer::Iterator', 'start')], is_const=True, is_virtual=True) - ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immeadiateAck) [member function] + ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetHtImmediateAck(bool immediateAck) [member function] cls.add_method('SetHtImmediateAck', 'void', - [param('bool', 'immeadiateAck')]) + [param('bool', 'immediateAck')]) ## ctrl-headers.h (module 'wifi'): void ns3::CtrlBAckResponseHeader::SetReceivedFragment(uint16_t seq, uint8_t frag) [member function] cls.add_method('SetReceivedFragment', 'void', @@ -8924,6 +8946,31 @@ 'void', [], visibility='protected', is_virtual=True) + ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr ns3::RegularWifiMac::GetDcaTxop() const [member function] + cls.add_method('GetDcaTxop', + 'ns3::Ptr< ns3::DcaTxop >', + [], + is_const=True, visibility='protected') + ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr ns3::RegularWifiMac::GetVOQueue() const [member function] + cls.add_method('GetVOQueue', + 'ns3::Ptr< ns3::EdcaTxopN >', + [], + is_const=True, visibility='protected') + ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr ns3::RegularWifiMac::GetVIQueue() const [member function] + cls.add_method('GetVIQueue', + 'ns3::Ptr< ns3::EdcaTxopN >', + [], + is_const=True, visibility='protected') + ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr ns3::RegularWifiMac::GetBEQueue() const [member function] + cls.add_method('GetBEQueue', + 'ns3::Ptr< ns3::EdcaTxopN >', + [], + is_const=True, visibility='protected') + ## regular-wifi-mac.h (module 'wifi'): ns3::Ptr ns3::RegularWifiMac::GetBKQueue() const [member function] + cls.add_method('GetBKQueue', + 'ns3::Ptr< ns3::EdcaTxopN >', + [], + is_const=True, visibility='protected') ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function] cls.add_method('FinishConfigureStandard', 'void',