Fix build with g++-4.5 + rescan python bindings.
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py Sat Dec 19 17:54:08 2009 +0300
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py Sun Dec 20 18:24:46 2009 +0100
@@ -3,6 +3,8 @@
def register_types(module):
root_module = module.get_root()
+ ## average.h: ns3::Average<double> [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_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 @@
register_Ns3Gnuplot3dFunction_methods(root_module, root_module['ns3::Gnuplot3dFunction'])
return
+def register_Ns3Average__Double_methods(root_module, cls):
+ ## average.h: ns3::Average<double>::Average(ns3::Average<double> const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::Average< double > const &', 'arg0')])
+ ## average.h: ns3::Average<double>::Average() [constructor]
+ cls.add_constructor([])
+ ## average.h: double ns3::Average<double>::Avg() const [member function]
+ cls.add_method('Avg',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: uint32_t ns3::Average<double>::Count() const [member function]
+ cls.add_method('Count',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Error90() const [member function]
+ cls.add_method('Error90',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Error95() const [member function]
+ cls.add_method('Error95',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Error99() const [member function]
+ cls.add_method('Error99',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Max() const [member function]
+ cls.add_method('Max',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Mean() const [member function]
+ cls.add_method('Mean',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Min() const [member function]
+ cls.add_method('Min',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: void ns3::Average<double>::Reset() [member function]
+ cls.add_method('Reset',
+ 'void',
+ [])
+ ## average.h: double ns3::Average<double>::Stddev() const [member function]
+ cls.add_method('Stddev',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: void ns3::Average<double>::Update(double const & x) [member function]
+ cls.add_method('Update',
+ 'void',
+ [param('double const &', 'x')])
+ ## average.h: double ns3::Average<double>::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')])
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py Sat Dec 19 17:54:08 2009 +0300
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py Sun Dec 20 18:24:46 2009 +0100
@@ -3,6 +3,8 @@
def register_types(module):
root_module = module.get_root()
+ ## average.h: ns3::Average<double> [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_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 @@
register_Ns3Gnuplot3dFunction_methods(root_module, root_module['ns3::Gnuplot3dFunction'])
return
+def register_Ns3Average__Double_methods(root_module, cls):
+ ## average.h: ns3::Average<double>::Average(ns3::Average<double> const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::Average< double > const &', 'arg0')])
+ ## average.h: ns3::Average<double>::Average() [constructor]
+ cls.add_constructor([])
+ ## average.h: double ns3::Average<double>::Avg() const [member function]
+ cls.add_method('Avg',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: uint32_t ns3::Average<double>::Count() const [member function]
+ cls.add_method('Count',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Error90() const [member function]
+ cls.add_method('Error90',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Error95() const [member function]
+ cls.add_method('Error95',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Error99() const [member function]
+ cls.add_method('Error99',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Max() const [member function]
+ cls.add_method('Max',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Mean() const [member function]
+ cls.add_method('Mean',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: double ns3::Average<double>::Min() const [member function]
+ cls.add_method('Min',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: void ns3::Average<double>::Reset() [member function]
+ cls.add_method('Reset',
+ 'void',
+ [])
+ ## average.h: double ns3::Average<double>::Stddev() const [member function]
+ cls.add_method('Stddev',
+ 'double',
+ [],
+ is_const=True)
+ ## average.h: void ns3::Average<double>::Update(double const & x) [member function]
+ cls.add_method('Update',
+ 'void',
+ [param('double const &', 'x')])
+ ## average.h: double ns3::Average<double>::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')])
--- a/src/common/packet-metadata.h Sat Dec 19 17:54:08 2009 +0300
+++ b/src/common/packet-metadata.h Sun Dec 20 18:24:46 2009 +0100
@@ -305,7 +305,7 @@
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),