From 116a8020b5429c857aa6dd6d3e055050afd28d3c Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 16 Apr 2010 14:05:08 +0100 Subject: [PATCH] API rescan for python --- .../apidefs/gcc-ILP32/ns3_module_common.py | 138 +++++++++++------- .../apidefs/gcc-ILP32/ns3_module_core.py | 2 +- .../apidefs/gcc-ILP32/ns3_module_helper.py | 8 +- .../apidefs/gcc-LP64/ns3_module_common.py | 138 +++++++++++------- .../apidefs/gcc-LP64/ns3_module_helper.py | 8 +- 5 files changed, 179 insertions(+), 115 deletions(-) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py index 8b3ab28e4..4ab415483 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py @@ -794,10 +794,12 @@ def register_Ns3PacketTagListTagData_methods(root_module, cls): return def register_Ns3PcapFile_methods(root_module, cls): - ## pcap-file.h: ns3::PcapFile::PcapFile(ns3::PcapFile const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PcapFile const &', 'arg0')]) ## pcap-file.h: ns3::PcapFile::PcapFile() [constructor] cls.add_constructor([]) + ## pcap-file.h: void ns3::PcapFile::Clear() [member function] + cls.add_method('Clear', + 'void', + []) ## pcap-file.h: void ns3::PcapFile::Close() [member function] cls.add_method('Close', 'void', @@ -807,6 +809,16 @@ def register_Ns3PcapFile_methods(root_module, cls): 'bool', [param('std::string const &', 'f1'), param('std::string const &', 'f2'), param('uint32_t &', 'sec'), param('uint32_t &', 'usec'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT')], is_static=True) + ## pcap-file.h: bool ns3::PcapFile::Eof() const [member function] + cls.add_method('Eof', + 'bool', + [], + is_const=True) + ## pcap-file.h: bool ns3::PcapFile::Fail() const [member function] + cls.add_method('Fail', + 'bool', + [], + is_const=True) ## pcap-file.h: uint32_t ns3::PcapFile::GetDataLinkType() [member function] cls.add_method('GetDataLinkType', 'uint32_t', @@ -839,22 +851,30 @@ def register_Ns3PcapFile_methods(root_module, cls): cls.add_method('GetVersionMinor', 'uint16_t', []) - ## pcap-file.h: bool ns3::PcapFile::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t timeZoneCorrection=ns3::PcapFile::ZONE_DEFAULT, bool swapMode=false) [member function] + ## pcap-file.h: void ns3::PcapFile::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t timeZoneCorrection=ns3::PcapFile::ZONE_DEFAULT, bool swapMode=false) [member function] cls.add_method('Init', - 'bool', + 'void', [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT'), param('int32_t', 'timeZoneCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT'), param('bool', 'swapMode', default_value='false')]) - ## pcap-file.h: bool ns3::PcapFile::Open(std::string const & filename, std::string const & mode) [member function] + ## pcap-file.h: void ns3::PcapFile::Open(std::string const & filename, std::_Ios_Openmode mode) [member function] cls.add_method('Open', - 'bool', - [param('std::string const &', 'filename'), param('std::string const &', 'mode')]) - ## pcap-file.h: bool ns3::PcapFile::Read(uint8_t * const data, uint32_t maxBytes, uint32_t & tsSec, uint32_t & tsUsec, uint32_t & inclLen, uint32_t & origLen, uint32_t & readLen) [member function] + 'void', + [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')]) + ## pcap-file.h: void ns3::PcapFile::Read(uint8_t * const data, uint32_t maxBytes, uint32_t & tsSec, uint32_t & tsUsec, uint32_t & inclLen, uint32_t & origLen, uint32_t & readLen) [member function] cls.add_method('Read', - 'bool', + 'void', [param('uint8_t * const', 'data'), param('uint32_t', 'maxBytes'), param('uint32_t &', 'tsSec'), param('uint32_t &', 'tsUsec'), param('uint32_t &', 'inclLen'), param('uint32_t &', 'origLen'), param('uint32_t &', 'readLen')]) - ## pcap-file.h: bool ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, uint8_t const * const data, uint32_t totalLen) [member function] + ## pcap-file.h: void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, uint8_t const * const data, uint32_t totalLen) [member function] cls.add_method('Write', - 'bool', + 'void', [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')]) + ## pcap-file.h: void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')]) + ## pcap-file.h: void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')]) ## pcap-file.h: ns3::PcapFile::SNAPLEN_DEFAULT [variable] cls.add_static_attribute('SNAPLEN_DEFAULT', 'uint32_t const', is_const=True) ## pcap-file.h: ns3::PcapFile::ZONE_DEFAULT [variable] @@ -1012,22 +1032,67 @@ def register_Ns3Header_methods(root_module, cls): return def register_Ns3PcapFileWrapper_methods(root_module, cls): - ## pcap-file-wrapper.h: ns3::PcapFileWrapper::PcapFileWrapper(ns3::PcapFileWrapper const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PcapFileWrapper const &', 'arg0')]) + ## pcap-file-wrapper.h: static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## pcap-file-wrapper.h: ns3::PcapFileWrapper::PcapFileWrapper() [constructor] cls.add_constructor([]) + ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Fail() const [member function] + cls.add_method('Fail', + 'bool', + [], + is_const=True) + ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Eof() const [member function] + cls.add_method('Eof', + 'bool', + [], + is_const=True) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Clear() [member function] + cls.add_method('Clear', + 'void', + []) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Open(std::string const & filename, std::_Ios_Openmode mode) [member function] + cls.add_method('Open', + 'void', + [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')]) ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Close() [member function] cls.add_method('Close', 'void', []) - ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetDataLinkType() [member function] - cls.add_method('GetDataLinkType', - 'uint32_t', - []) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Init(uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits::max(), int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function] + cls.add_method('Init', + 'void', + [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')]) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')]) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')]) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Write(ns3::Time t, uint8_t const * buffer, uint32_t length) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Time', 't'), param('uint8_t const *', 'buffer'), param('uint32_t', 'length')]) ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetMagic() [member function] cls.add_method('GetMagic', 'uint32_t', []) + ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMajor() [member function] + cls.add_method('GetVersionMajor', + 'uint16_t', + []) + ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMinor() [member function] + cls.add_method('GetVersionMinor', + 'uint16_t', + []) + ## pcap-file-wrapper.h: int32_t ns3::PcapFileWrapper::GetTimeZoneOffset() [member function] + cls.add_method('GetTimeZoneOffset', + 'int32_t', + []) ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetSigFigs() [member function] cls.add_method('GetSigFigs', 'uint32_t', @@ -1036,43 +1101,10 @@ def register_Ns3PcapFileWrapper_methods(root_module, cls): cls.add_method('GetSnapLen', 'uint32_t', []) - ## pcap-file-wrapper.h: int32_t ns3::PcapFileWrapper::GetTimeZoneOffset() [member function] - cls.add_method('GetTimeZoneOffset', - 'int32_t', + ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetDataLinkType() [member function] + cls.add_method('GetDataLinkType', + 'uint32_t', []) - ## pcap-file-wrapper.h: static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMajor() [member function] - cls.add_method('GetVersionMajor', - 'uint16_t', - []) - ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMinor() [member function] - cls.add_method('GetVersionMinor', - 'uint16_t', - []) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Init(uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits::max(), int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function] - cls.add_method('Init', - 'bool', - [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Open(std::string const & filename, std::string const & mode) [member function] - cls.add_method('Open', - 'bool', - [param('std::string const &', 'filename'), param('std::string const &', 'mode')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr p) [member function] - cls.add_method('Write', - 'bool', - [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr p) [member function] - cls.add_method('Write', - 'bool', - [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Write(ns3::Time t, uint8_t const * buffer, uint32_t length) [member function] - cls.add_method('Write', - 'bool', - [param('ns3::Time', 't'), param('uint8_t const *', 'buffer'), param('uint32_t', 'length')]) return def register_Ns3PropagationDelayModel_methods(root_module, cls): diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py index 336db0fdb..fc996d3f7 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py @@ -3078,7 +3078,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['long']) + template_parameters=['long long']) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py index 3ef4b3772..367f3b746 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py @@ -373,10 +373,10 @@ def register_Ns3AsciiTraceHelper_methods(root_module, cls): cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')]) ## trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor] cls.add_constructor([]) - ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function] + ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::_Ios_Openmode filemode=std::ios_base::out) [member function] cls.add_method('CreateFileStream', 'ns3::Ptr< ns3::OutputStreamWrapper >', - [param('std::string', 'filename'), param('std::string', 'filemode', default_value='"w"')]) + [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')]) ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultDequeueSinkWithContext', 'void', @@ -1356,10 +1356,10 @@ def register_Ns3PcapHelper_methods(root_module, cls): cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')]) ## trace-helper.h: ns3::PcapHelper::PcapHelper() [constructor] cls.add_constructor([]) - ## trace-helper.h: ns3::Ptr ns3::PcapHelper::CreateFile(std::string filename, std::string filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function] + ## trace-helper.h: ns3::Ptr ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function] cls.add_method('CreateFile', 'ns3::Ptr< ns3::PcapFileWrapper >', - [param('std::string', 'filename'), param('std::string', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')]) + [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')]) ## trace-helper.h: std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr device, bool useObjectNames=true) [member function] cls.add_method('GetFilenameFromDevice', 'std::string', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py index 8b3ab28e4..4ab415483 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py @@ -794,10 +794,12 @@ def register_Ns3PacketTagListTagData_methods(root_module, cls): return def register_Ns3PcapFile_methods(root_module, cls): - ## pcap-file.h: ns3::PcapFile::PcapFile(ns3::PcapFile const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PcapFile const &', 'arg0')]) ## pcap-file.h: ns3::PcapFile::PcapFile() [constructor] cls.add_constructor([]) + ## pcap-file.h: void ns3::PcapFile::Clear() [member function] + cls.add_method('Clear', + 'void', + []) ## pcap-file.h: void ns3::PcapFile::Close() [member function] cls.add_method('Close', 'void', @@ -807,6 +809,16 @@ def register_Ns3PcapFile_methods(root_module, cls): 'bool', [param('std::string const &', 'f1'), param('std::string const &', 'f2'), param('uint32_t &', 'sec'), param('uint32_t &', 'usec'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT')], is_static=True) + ## pcap-file.h: bool ns3::PcapFile::Eof() const [member function] + cls.add_method('Eof', + 'bool', + [], + is_const=True) + ## pcap-file.h: bool ns3::PcapFile::Fail() const [member function] + cls.add_method('Fail', + 'bool', + [], + is_const=True) ## pcap-file.h: uint32_t ns3::PcapFile::GetDataLinkType() [member function] cls.add_method('GetDataLinkType', 'uint32_t', @@ -839,22 +851,30 @@ def register_Ns3PcapFile_methods(root_module, cls): cls.add_method('GetVersionMinor', 'uint16_t', []) - ## pcap-file.h: bool ns3::PcapFile::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t timeZoneCorrection=ns3::PcapFile::ZONE_DEFAULT, bool swapMode=false) [member function] + ## pcap-file.h: void ns3::PcapFile::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t timeZoneCorrection=ns3::PcapFile::ZONE_DEFAULT, bool swapMode=false) [member function] cls.add_method('Init', - 'bool', + 'void', [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT'), param('int32_t', 'timeZoneCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT'), param('bool', 'swapMode', default_value='false')]) - ## pcap-file.h: bool ns3::PcapFile::Open(std::string const & filename, std::string const & mode) [member function] + ## pcap-file.h: void ns3::PcapFile::Open(std::string const & filename, std::_Ios_Openmode mode) [member function] cls.add_method('Open', - 'bool', - [param('std::string const &', 'filename'), param('std::string const &', 'mode')]) - ## pcap-file.h: bool ns3::PcapFile::Read(uint8_t * const data, uint32_t maxBytes, uint32_t & tsSec, uint32_t & tsUsec, uint32_t & inclLen, uint32_t & origLen, uint32_t & readLen) [member function] + 'void', + [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')]) + ## pcap-file.h: void ns3::PcapFile::Read(uint8_t * const data, uint32_t maxBytes, uint32_t & tsSec, uint32_t & tsUsec, uint32_t & inclLen, uint32_t & origLen, uint32_t & readLen) [member function] cls.add_method('Read', - 'bool', + 'void', [param('uint8_t * const', 'data'), param('uint32_t', 'maxBytes'), param('uint32_t &', 'tsSec'), param('uint32_t &', 'tsUsec'), param('uint32_t &', 'inclLen'), param('uint32_t &', 'origLen'), param('uint32_t &', 'readLen')]) - ## pcap-file.h: bool ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, uint8_t const * const data, uint32_t totalLen) [member function] + ## pcap-file.h: void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, uint8_t const * const data, uint32_t totalLen) [member function] cls.add_method('Write', - 'bool', + 'void', [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('uint8_t const * const', 'data'), param('uint32_t', 'totalLen')]) + ## pcap-file.h: void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Ptr< ns3::Packet const >', 'p')]) + ## pcap-file.h: void ns3::PcapFile::Write(uint32_t tsSec, uint32_t tsUsec, ns3::Header & header, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('uint32_t', 'tsSec'), param('uint32_t', 'tsUsec'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')]) ## pcap-file.h: ns3::PcapFile::SNAPLEN_DEFAULT [variable] cls.add_static_attribute('SNAPLEN_DEFAULT', 'uint32_t const', is_const=True) ## pcap-file.h: ns3::PcapFile::ZONE_DEFAULT [variable] @@ -1012,22 +1032,67 @@ def register_Ns3Header_methods(root_module, cls): return def register_Ns3PcapFileWrapper_methods(root_module, cls): - ## pcap-file-wrapper.h: ns3::PcapFileWrapper::PcapFileWrapper(ns3::PcapFileWrapper const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PcapFileWrapper const &', 'arg0')]) + ## pcap-file-wrapper.h: static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) ## pcap-file-wrapper.h: ns3::PcapFileWrapper::PcapFileWrapper() [constructor] cls.add_constructor([]) + ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Fail() const [member function] + cls.add_method('Fail', + 'bool', + [], + is_const=True) + ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Eof() const [member function] + cls.add_method('Eof', + 'bool', + [], + is_const=True) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Clear() [member function] + cls.add_method('Clear', + 'void', + []) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Open(std::string const & filename, std::_Ios_Openmode mode) [member function] + cls.add_method('Open', + 'void', + [param('std::string const &', 'filename'), param('std::_Ios_Openmode', 'mode')]) ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Close() [member function] cls.add_method('Close', 'void', []) - ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetDataLinkType() [member function] - cls.add_method('GetDataLinkType', - 'uint32_t', - []) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Init(uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits::max(), int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function] + cls.add_method('Init', + 'void', + [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')]) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')]) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr p) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')]) + ## pcap-file-wrapper.h: void ns3::PcapFileWrapper::Write(ns3::Time t, uint8_t const * buffer, uint32_t length) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Time', 't'), param('uint8_t const *', 'buffer'), param('uint32_t', 'length')]) ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetMagic() [member function] cls.add_method('GetMagic', 'uint32_t', []) + ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMajor() [member function] + cls.add_method('GetVersionMajor', + 'uint16_t', + []) + ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMinor() [member function] + cls.add_method('GetVersionMinor', + 'uint16_t', + []) + ## pcap-file-wrapper.h: int32_t ns3::PcapFileWrapper::GetTimeZoneOffset() [member function] + cls.add_method('GetTimeZoneOffset', + 'int32_t', + []) ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetSigFigs() [member function] cls.add_method('GetSigFigs', 'uint32_t', @@ -1036,43 +1101,10 @@ def register_Ns3PcapFileWrapper_methods(root_module, cls): cls.add_method('GetSnapLen', 'uint32_t', []) - ## pcap-file-wrapper.h: int32_t ns3::PcapFileWrapper::GetTimeZoneOffset() [member function] - cls.add_method('GetTimeZoneOffset', - 'int32_t', + ## pcap-file-wrapper.h: uint32_t ns3::PcapFileWrapper::GetDataLinkType() [member function] + cls.add_method('GetDataLinkType', + 'uint32_t', []) - ## pcap-file-wrapper.h: static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMajor() [member function] - cls.add_method('GetVersionMajor', - 'uint16_t', - []) - ## pcap-file-wrapper.h: uint16_t ns3::PcapFileWrapper::GetVersionMinor() [member function] - cls.add_method('GetVersionMinor', - 'uint16_t', - []) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Init(uint32_t dataLinkType, uint32_t snapLen=std::numeric_limits::max(), int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function] - cls.add_method('Init', - 'bool', - [param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='std::numeric_limits::max()'), param('int32_t', 'tzCorrection', default_value='ns3::PcapFile::ZONE_DEFAULT')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Open(std::string const & filename, std::string const & mode) [member function] - cls.add_method('Open', - 'bool', - [param('std::string const &', 'filename'), param('std::string const &', 'mode')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Ptr p) [member function] - cls.add_method('Write', - 'bool', - [param('ns3::Time', 't'), param('ns3::Ptr< ns3::Packet const >', 'p')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Write(ns3::Time t, ns3::Header & header, ns3::Ptr p) [member function] - cls.add_method('Write', - 'bool', - [param('ns3::Time', 't'), param('ns3::Header &', 'header'), param('ns3::Ptr< ns3::Packet const >', 'p')]) - ## pcap-file-wrapper.h: bool ns3::PcapFileWrapper::Write(ns3::Time t, uint8_t const * buffer, uint32_t length) [member function] - cls.add_method('Write', - 'bool', - [param('ns3::Time', 't'), param('uint8_t const *', 'buffer'), param('uint32_t', 'length')]) return def register_Ns3PropagationDelayModel_methods(root_module, cls): diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py index 3ef4b3772..367f3b746 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py @@ -373,10 +373,10 @@ def register_Ns3AsciiTraceHelper_methods(root_module, cls): cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')]) ## trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor] cls.add_constructor([]) - ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function] + ## trace-helper.h: ns3::Ptr ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::_Ios_Openmode filemode=std::ios_base::out) [member function] cls.add_method('CreateFileStream', 'ns3::Ptr< ns3::OutputStreamWrapper >', - [param('std::string', 'filename'), param('std::string', 'filemode', default_value='"w"')]) + [param('std::string', 'filename'), param('std::_Ios_Openmode', 'filemode', default_value='std::ios_base::out')]) ## trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr file, std::string context, ns3::Ptr p) [member function] cls.add_method('DefaultDequeueSinkWithContext', 'void', @@ -1356,10 +1356,10 @@ def register_Ns3PcapHelper_methods(root_module, cls): cls.add_constructor([param('ns3::PcapHelper const &', 'arg0')]) ## trace-helper.h: ns3::PcapHelper::PcapHelper() [constructor] cls.add_constructor([]) - ## trace-helper.h: ns3::Ptr ns3::PcapHelper::CreateFile(std::string filename, std::string filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function] + ## trace-helper.h: ns3::Ptr ns3::PcapHelper::CreateFile(std::string filename, std::_Ios_Openmode filemode, uint32_t dataLinkType, uint32_t snapLen=65535, int32_t tzCorrection=0) [member function] cls.add_method('CreateFile', 'ns3::Ptr< ns3::PcapFileWrapper >', - [param('std::string', 'filename'), param('std::string', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')]) + [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')]) ## trace-helper.h: std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr device, bool useObjectNames=true) [member function] cls.add_method('GetFilenameFromDevice', 'std::string',