diff -r ff978a217184 -r 67c6b025f766 src/csma/bindings/modulegen__gcc_ILP32.py --- a/src/csma/bindings/modulegen__gcc_ILP32.py Tue May 01 11:56:16 2012 -0700 +++ b/src/csma/bindings/modulegen__gcc_ILP32.py Tue May 01 11:56:30 2012 -0700 @@ -1051,20 +1051,20 @@ return def register_Ns3CsmaDeviceRec_methods(root_module, cls): - ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::CsmaDeviceRec(ns3::CsmaDeviceRec const & arg0) [copy constructor] - cls.add_constructor([param('ns3::CsmaDeviceRec const &', 'arg0')]) + ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::devicePtr [variable] + cls.add_instance_attribute('devicePtr', 'ns3::Ptr< ns3::CsmaNetDevice >', is_const=False) + ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::active [variable] + cls.add_instance_attribute('active', 'bool', is_const=False) ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::CsmaDeviceRec() [constructor] cls.add_constructor([]) ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::CsmaDeviceRec(ns3::Ptr device) [constructor] cls.add_constructor([param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')]) + ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::CsmaDeviceRec(ns3::CsmaDeviceRec const & arg0) [copy constructor] + cls.add_constructor([param('ns3::CsmaDeviceRec const &', 'arg0')]) ## csma-channel.h (module 'csma'): bool ns3::CsmaDeviceRec::IsActive() [member function] cls.add_method('IsActive', 'bool', []) - ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::active [variable] - cls.add_instance_attribute('active', 'bool', is_const=False) - ## csma-channel.h (module 'csma'): ns3::CsmaDeviceRec::devicePtr [variable] - cls.add_instance_attribute('devicePtr', 'ns3::Ptr< ns3::CsmaNetDevice >', is_const=False) return def register_Ns3DataRate_methods(root_module, cls): @@ -3641,8 +3641,11 @@ return def register_Ns3CsmaChannel_methods(root_module, cls): - ## csma-channel.h (module 'csma'): ns3::CsmaChannel::CsmaChannel(ns3::CsmaChannel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::CsmaChannel const &', 'arg0')]) + ## csma-channel.h (module 'csma'): static ns3::TypeId ns3::CsmaChannel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## csma-channel.h (module 'csma'): ns3::CsmaChannel::CsmaChannel() [constructor] cls.add_constructor([]) ## csma-channel.h (module 'csma'): int32_t ns3::CsmaChannel::Attach(ns3::Ptr device) [member function] @@ -3657,6 +3660,56 @@ cls.add_method('Detach', 'bool', [param('uint32_t', 'deviceId')]) + ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::Reattach(uint32_t deviceId) [member function] + cls.add_method('Reattach', + 'bool', + [param('uint32_t', 'deviceId')]) + ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::Reattach(ns3::Ptr device) [member function] + cls.add_method('Reattach', + 'bool', + [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')]) + ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::TransmitStart(ns3::Ptr p, uint32_t srcId) [member function] + cls.add_method('TransmitStart', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint32_t', 'srcId')]) + ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::TransmitEnd() [member function] + cls.add_method('TransmitEnd', + 'bool', + []) + ## csma-channel.h (module 'csma'): void ns3::CsmaChannel::PropagationCompleteEvent() [member function] + cls.add_method('PropagationCompleteEvent', + 'void', + []) + ## csma-channel.h (module 'csma'): int32_t ns3::CsmaChannel::GetDeviceNum(ns3::Ptr device) [member function] + cls.add_method('GetDeviceNum', + 'int32_t', + [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')]) + ## csma-channel.h (module 'csma'): ns3::WireState ns3::CsmaChannel::GetState() [member function] + cls.add_method('GetState', + 'ns3::WireState', + []) + ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::IsBusy() [member function] + cls.add_method('IsBusy', + 'bool', + []) + ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::IsActive(uint32_t deviceId) [member function] + cls.add_method('IsActive', + 'bool', + [param('uint32_t', 'deviceId')]) + ## csma-channel.h (module 'csma'): uint32_t ns3::CsmaChannel::GetNumActDevices() [member function] + cls.add_method('GetNumActDevices', + 'uint32_t', + []) + ## csma-channel.h (module 'csma'): uint32_t ns3::CsmaChannel::GetNDevices() const [member function] + cls.add_method('GetNDevices', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## csma-channel.h (module 'csma'): ns3::Ptr ns3::CsmaChannel::GetDevice(uint32_t i) const [member function] + cls.add_method('GetDevice', + 'ns3::Ptr< ns3::NetDevice >', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) ## csma-channel.h (module 'csma'): ns3::Ptr ns3::CsmaChannel::GetCsmaDevice(uint32_t i) const [member function] cls.add_method('GetCsmaDevice', 'ns3::Ptr< ns3::CsmaNetDevice >', @@ -3670,61 +3723,6 @@ cls.add_method('GetDelay', 'ns3::Time', []) - ## csma-channel.h (module 'csma'): ns3::Ptr ns3::CsmaChannel::GetDevice(uint32_t i) const [member function] - cls.add_method('GetDevice', - 'ns3::Ptr< ns3::NetDevice >', - [param('uint32_t', 'i')], - is_const=True, is_virtual=True) - ## csma-channel.h (module 'csma'): int32_t ns3::CsmaChannel::GetDeviceNum(ns3::Ptr device) [member function] - cls.add_method('GetDeviceNum', - 'int32_t', - [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')]) - ## csma-channel.h (module 'csma'): uint32_t ns3::CsmaChannel::GetNDevices() const [member function] - cls.add_method('GetNDevices', - 'uint32_t', - [], - is_const=True, is_virtual=True) - ## csma-channel.h (module 'csma'): uint32_t ns3::CsmaChannel::GetNumActDevices() [member function] - cls.add_method('GetNumActDevices', - 'uint32_t', - []) - ## csma-channel.h (module 'csma'): ns3::WireState ns3::CsmaChannel::GetState() [member function] - cls.add_method('GetState', - 'ns3::WireState', - []) - ## csma-channel.h (module 'csma'): static ns3::TypeId ns3::CsmaChannel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::IsActive(uint32_t deviceId) [member function] - cls.add_method('IsActive', - 'bool', - [param('uint32_t', 'deviceId')]) - ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::IsBusy() [member function] - cls.add_method('IsBusy', - 'bool', - []) - ## csma-channel.h (module 'csma'): void ns3::CsmaChannel::PropagationCompleteEvent() [member function] - cls.add_method('PropagationCompleteEvent', - 'void', - []) - ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::Reattach(uint32_t deviceId) [member function] - cls.add_method('Reattach', - 'bool', - [param('uint32_t', 'deviceId')]) - ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::Reattach(ns3::Ptr device) [member function] - cls.add_method('Reattach', - 'bool', - [param('ns3::Ptr< ns3::CsmaNetDevice >', 'device')]) - ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::TransmitEnd() [member function] - cls.add_method('TransmitEnd', - 'bool', - []) - ## csma-channel.h (module 'csma'): bool ns3::CsmaChannel::TransmitStart(ns3::Ptr p, uint32_t srcId) [member function] - cls.add_method('TransmitStart', - 'bool', - [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint32_t', 'srcId')]) return def register_Ns3DataRateChecker_methods(root_module, cls):