From 61c9d74b0eba8acb3084051948859de4ed647c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Richart?= Date: Tue, 25 Aug 2015 06:46:23 -0700 Subject: [PATCH] Bug 2171 - power-adaptation-distance.cc:202:22: error: call to 'pow' is ambiguous --- examples/wireless/power-adaptation-distance.cc | 4 ++-- examples/wireless/power-adaptation-interference.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/wireless/power-adaptation-distance.cc b/examples/wireless/power-adaptation-distance.cc index a04473abb..3497bdf08 100644 --- a/examples/wireless/power-adaptation-distance.cc +++ b/examples/wireless/power-adaptation-distance.cc @@ -129,7 +129,7 @@ private: void SetupPhy (Ptr phy); Time GetCalcTxTime (WifiMode mode); - std::map actualPower; + std::map actualPower; std::map actualMode; uint32_t m_bytesTotal; double totalEnergy; @@ -199,7 +199,7 @@ NodeStatistics::PhyCallback (std::string path, Ptr packet) if (head.GetType() == WIFI_MAC_DATA) { - totalEnergy += pow (10, actualPower[dest] / 10) * GetCalcTxTime (actualMode[dest]).GetSeconds (); + totalEnergy += pow (10.0, actualPower[dest] / 10.0) * GetCalcTxTime (actualMode[dest]).GetSeconds (); totalTime += GetCalcTxTime (actualMode[dest]).GetSeconds (); } } diff --git a/examples/wireless/power-adaptation-interference.cc b/examples/wireless/power-adaptation-interference.cc index 023d5abec..bb0e4a18e 100644 --- a/examples/wireless/power-adaptation-interference.cc +++ b/examples/wireless/power-adaptation-interference.cc @@ -102,7 +102,7 @@ private: void SetupPhy (Ptr phy); Time GetCalcTxTime (WifiMode mode); - std::map actualPower; + std::map actualPower; std::map actualMode; uint32_t m_bytesTotal; double totalEnergy; @@ -195,7 +195,7 @@ NodeStatistics::PhyCallback (std::string path, Ptr packet) if (head.GetType() == WIFI_MAC_DATA) { - totalEnergy += pow(10, actualPower[dest] / 10) * GetCalcTxTime (actualMode[dest]).GetSeconds (); + totalEnergy += pow (10.0, actualPower[dest] / 10.0) * GetCalcTxTime (actualMode[dest]).GetSeconds (); totalTime += GetCalcTxTime (actualMode[dest]).GetSeconds (); } }