From f75ccd609fdc7c878065f5ca9d001d6502d26ecf Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 8 Sep 2012 09:39:45 -0700 Subject: [PATCH] fix error: call of overloaded pow() is ambiguous --- src/dsr/model/dsr-routing.cc | 2 +- src/wimax/model/simple-ofdm-wimax-phy.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc index e8927d302..15da63f12 100644 --- a/src/dsr/model/dsr-routing.cc +++ b/src/dsr/model/dsr-routing.cc @@ -2613,7 +2613,7 @@ DsrRouting::ScheduleRreqRetry (Ptr packet, std::vector addr if (m_rreqTable->GetRreqCnt (dst)) { // When the route request count is larger than 0 - rreqDelay = Time (std::pow (m_rreqTable->GetRreqCnt (dst), 2) * m_requestPeriod); + rreqDelay = Time (std::pow (static_cast (m_rreqTable->GetRreqCnt (dst)), 2.0) * m_requestPeriod); } else { diff --git a/src/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc index 6b87f879a..9876e7c90 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.cc +++ b/src/wimax/model/simple-ofdm-wimax-phy.cc @@ -522,7 +522,7 @@ SimpleOfdmWimaxPhy::ConvertBitsToBurst (bvec buffer) for (int l = 0; l < 8; l++) { bool bin = buffer.at (i + l); - temp += (uint8_t)(bin * std::pow (2, (7 - l))); + temp += (uint8_t)(bin * std::pow (2.0, (7 - l))); } *(pstart + j) = temp;