From 83ebd91e1b4826c8122293bbd00d23c2dd0714fc Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Sun, 20 Dec 2009 18:24:46 +0100 Subject: [PATCH] Fix build with g++-4.5 + rescan python bindings. --- .../apidefs/gcc-ILP32/ns3_module_contrib.py | 68 +++++++++++++++++++ .../apidefs/gcc-LP64/ns3_module_contrib.py | 68 +++++++++++++++++++ src/common/packet-metadata.h | 2 +- 3 files changed, 137 insertions(+), 1 deletion(-) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py index a859cc20c..aeed10d58 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py @@ -3,6 +3,8 @@ from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandler def register_types(module): root_module = module.get_root() + ## average.h: ns3::Average [class] + module.add_class('Average', template_parameters=['double']) ## delay-jitter-estimation.h: ns3::DelayJitterEstimation [class] module.add_class('DelayJitterEstimation') ## event-garbage-collector.h: ns3::EventGarbageCollector [class] @@ -121,6 +123,7 @@ def register_types_ns3_olsr(module): def register_methods(root_module): + register_Ns3Average__Double_methods(root_module, root_module['ns3::Average< double >']) register_Ns3DelayJitterEstimation_methods(root_module, root_module['ns3::DelayJitterEstimation']) register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector']) register_Ns3FileConfig_methods(root_module, root_module['ns3::FileConfig']) @@ -137,6 +140,71 @@ def register_methods(root_module): register_Ns3Gnuplot3dFunction_methods(root_module, root_module['ns3::Gnuplot3dFunction']) return +def register_Ns3Average__Double_methods(root_module, cls): + ## average.h: ns3::Average::Average(ns3::Average const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Average< double > const &', 'arg0')]) + ## average.h: ns3::Average::Average() [constructor] + cls.add_constructor([]) + ## average.h: double ns3::Average::Avg() const [member function] + cls.add_method('Avg', + 'double', + [], + is_const=True) + ## average.h: uint32_t ns3::Average::Count() const [member function] + cls.add_method('Count', + 'uint32_t', + [], + is_const=True) + ## average.h: double ns3::Average::Error90() const [member function] + cls.add_method('Error90', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Error95() const [member function] + cls.add_method('Error95', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Error99() const [member function] + cls.add_method('Error99', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Max() const [member function] + cls.add_method('Max', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Mean() const [member function] + cls.add_method('Mean', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Min() const [member function] + cls.add_method('Min', + 'double', + [], + is_const=True) + ## average.h: void ns3::Average::Reset() [member function] + cls.add_method('Reset', + 'void', + []) + ## average.h: double ns3::Average::Stddev() const [member function] + cls.add_method('Stddev', + 'double', + [], + is_const=True) + ## average.h: void ns3::Average::Update(double const & x) [member function] + cls.add_method('Update', + 'void', + [param('double const &', 'x')]) + ## average.h: double ns3::Average::Var() const [member function] + cls.add_method('Var', + 'double', + [], + is_const=True) + return + def register_Ns3DelayJitterEstimation_methods(root_module, cls): ## delay-jitter-estimation.h: ns3::DelayJitterEstimation::DelayJitterEstimation(ns3::DelayJitterEstimation const & arg0) [copy constructor] cls.add_constructor([param('ns3::DelayJitterEstimation const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py index a859cc20c..aeed10d58 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py @@ -3,6 +3,8 @@ from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandler def register_types(module): root_module = module.get_root() + ## average.h: ns3::Average [class] + module.add_class('Average', template_parameters=['double']) ## delay-jitter-estimation.h: ns3::DelayJitterEstimation [class] module.add_class('DelayJitterEstimation') ## event-garbage-collector.h: ns3::EventGarbageCollector [class] @@ -121,6 +123,7 @@ def register_types_ns3_olsr(module): def register_methods(root_module): + register_Ns3Average__Double_methods(root_module, root_module['ns3::Average< double >']) register_Ns3DelayJitterEstimation_methods(root_module, root_module['ns3::DelayJitterEstimation']) register_Ns3EventGarbageCollector_methods(root_module, root_module['ns3::EventGarbageCollector']) register_Ns3FileConfig_methods(root_module, root_module['ns3::FileConfig']) @@ -137,6 +140,71 @@ def register_methods(root_module): register_Ns3Gnuplot3dFunction_methods(root_module, root_module['ns3::Gnuplot3dFunction']) return +def register_Ns3Average__Double_methods(root_module, cls): + ## average.h: ns3::Average::Average(ns3::Average const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Average< double > const &', 'arg0')]) + ## average.h: ns3::Average::Average() [constructor] + cls.add_constructor([]) + ## average.h: double ns3::Average::Avg() const [member function] + cls.add_method('Avg', + 'double', + [], + is_const=True) + ## average.h: uint32_t ns3::Average::Count() const [member function] + cls.add_method('Count', + 'uint32_t', + [], + is_const=True) + ## average.h: double ns3::Average::Error90() const [member function] + cls.add_method('Error90', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Error95() const [member function] + cls.add_method('Error95', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Error99() const [member function] + cls.add_method('Error99', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Max() const [member function] + cls.add_method('Max', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Mean() const [member function] + cls.add_method('Mean', + 'double', + [], + is_const=True) + ## average.h: double ns3::Average::Min() const [member function] + cls.add_method('Min', + 'double', + [], + is_const=True) + ## average.h: void ns3::Average::Reset() [member function] + cls.add_method('Reset', + 'void', + []) + ## average.h: double ns3::Average::Stddev() const [member function] + cls.add_method('Stddev', + 'double', + [], + is_const=True) + ## average.h: void ns3::Average::Update(double const & x) [member function] + cls.add_method('Update', + 'void', + [param('double const &', 'x')]) + ## average.h: double ns3::Average::Var() const [member function] + cls.add_method('Var', + 'double', + [], + is_const=True) + return + def register_Ns3DelayJitterEstimation_methods(root_module, cls): ## delay-jitter-estimation.h: ns3::DelayJitterEstimation::DelayJitterEstimation(ns3::DelayJitterEstimation const & arg0) [copy constructor] cls.add_constructor([param('ns3::DelayJitterEstimation const &', 'arg0')]) diff --git a/src/common/packet-metadata.h b/src/common/packet-metadata.h index a2d5228fc..e730db03d 100644 --- a/src/common/packet-metadata.h +++ b/src/common/packet-metadata.h @@ -305,7 +305,7 @@ private: namespace ns3 { PacketMetadata::PacketMetadata (uint32_t uid, uint32_t size) - : m_data (m_data = PacketMetadata::Create (10)), + : m_data (PacketMetadata::Create (10)), m_head (0xffff), m_tail (0xffff), m_used (0),