From f19c5ff40846cec063bc701fc75caa01fea1bd02 Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Thu, 17 Sep 2009 07:25:36 +0200 Subject: [PATCH] Fix build on g++-4.x. --- bindings/python/ns3_module_flow_monitor.py | 4 ++-- src/contrib/flow-monitor/histogram.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/python/ns3_module_flow_monitor.py b/bindings/python/ns3_module_flow_monitor.py index 88b4135ca..515c1ee7f 100644 --- a/bindings/python/ns3_module_flow_monitor.py +++ b/bindings/python/ns3_module_flow_monitor.py @@ -207,7 +207,7 @@ def register_Ns3FlowProbeFlowStats_methods(root_module, cls): ## flow-probe.h: ns3::FlowProbe::FlowStats::bytes [variable] cls.add_instance_attribute('bytes', 'uint64_t', is_const=False) ## flow-probe.h: ns3::FlowProbe::FlowStats::bytesDropped [variable] - cls.add_instance_attribute('bytesDropped', 'std::vector< unsigned long long >', is_const=False) + cls.add_instance_attribute('bytesDropped', 'std::vector< uint64_t >', is_const=False) ## flow-probe.h: ns3::FlowProbe::FlowStats::delayFromFirstProbeSum [variable] cls.add_instance_attribute('delayFromFirstProbeSum', 'ns3::Time', is_const=False) ## flow-probe.h: ns3::FlowProbe::FlowStats::packets [variable] @@ -361,7 +361,7 @@ def register_Ns3FlowMonitorFlowStats_methods(root_module, cls): ## flow-monitor.h: ns3::FlowMonitor::FlowStats::FlowStats(ns3::FlowMonitor::FlowStats const & arg0) [copy constructor] cls.add_constructor([param('ns3::FlowMonitor::FlowStats const &', 'arg0')]) ## flow-monitor.h: ns3::FlowMonitor::FlowStats::bytesDropped [variable] - cls.add_instance_attribute('bytesDropped', 'std::vector< unsigned long long >', is_const=False) + cls.add_instance_attribute('bytesDropped', 'std::vector< uint64_t >', is_const=False) ## flow-monitor.h: ns3::FlowMonitor::FlowStats::delayHistogram [variable] cls.add_instance_attribute('delayHistogram', 'ns3::Histogram', is_const=False) ## flow-monitor.h: ns3::FlowMonitor::FlowStats::delaySum [variable] diff --git a/src/contrib/flow-monitor/histogram.cc b/src/contrib/flow-monitor/histogram.cc index ec1b31190..e3c822a52 100644 --- a/src/contrib/flow-monitor/histogram.cc +++ b/src/contrib/flow-monitor/histogram.cc @@ -78,7 +78,7 @@ Histogram::GetBinCount (uint32_t index) void Histogram::AddValue (double value) { - uint32_t index = floor (value/m_binWidth); + uint32_t index = (uint32_t)floor (value/m_binWidth); //check if we need to resize the vector NS_LOG_DEBUG ("AddValue: index=" << index << ", m_histogram.size()=" << m_histogram.size ());