aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorMichael Dickens <mlk@alum.mit.edu>2018-12-06 13:17:06 -0500
committerBrent Stapleton <brent.stapleton@ettus.com>2018-12-12 19:23:21 -0800
commiteac84f1b7f3b652bc46a1370c8f68aa5b2477330 (patch)
treeeff83a226bcec0d0725cd238d9f76826060f7916 /host/lib/usrp
parent865151108279e1b3cb25d288335d76dc3eef7e4e (diff)
downloaduhd-eac84f1b7f3b652bc46a1370c8f68aa5b2477330.tar.gz
uhd-eac84f1b7f3b652bc46a1370c8f68aa5b2477330.tar.bz2
uhd-eac84f1b7f3b652bc46a1370c8f68aa5b2477330.zip
various: use "std::abs" instead of "std::fabs"
+ better compiler compatibility + let the compiler figure out the actual function IO signature that makes sense, instead of forcing float.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/gpsd_iface.cpp10
-rw-r--r--host/lib/usrp/x300/x300_dboard_iface.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/gpsd_iface.cpp b/host/lib/usrp/gpsd_iface.cpp
index b34132fa0..1858a6a24 100644
--- a/host/lib/usrp/gpsd_iface.cpp
+++ b/host/lib/usrp/gpsd_iface.cpp
@@ -210,9 +210,9 @@ private: // member functions
% tm.tm_min
% tm.tm_sec
% (_gps_data.status ? 'A' : 'V')
- % _zeroize(_deg_to_dm(std::fabs(_gps_data.fix.latitude)))
+ % _zeroize(_deg_to_dm(std::abs(_gps_data.fix.latitude)))
% ((_gps_data.fix.latitude > 0) ? 'N' : 'S')
- % _zeroize(_deg_to_dm(std::fabs(_gps_data.fix.longitude)))
+ % _zeroize(_deg_to_dm(std::abs(_gps_data.fix.longitude)))
% ((_gps_data.fix.longitude > 0) ? 'E' : 'W')
% _zeroize(_gps_data.fix.speed * MPS_TO_KNOTS)
% _zeroize(_gps_data.fix.track)
@@ -242,9 +242,9 @@ private: // member functions
% tm.tm_hour
% tm.tm_min
% tm.tm_sec
- % _deg_to_dm(std::fabs(_gps_data.fix.latitude))
+ % _deg_to_dm(std::abs(_gps_data.fix.latitude))
% ((_gps_data.fix.latitude > 0) ? 'N' : 'S')
- % _deg_to_dm(std::fabs(_gps_data.fix.longitude))
+ % _deg_to_dm(std::abs(_gps_data.fix.longitude))
% ((_gps_data.fix.longitude > 0) ? 'E' : 'W')
% _gps_data.status
% _gps_data.satellites_used);
@@ -271,7 +271,7 @@ private: // member functions
string.append(",");
else {
string.append(
- str(boost::format("%3.2f,%s") % std::fabs(mag_var)
+ str(boost::format("%3.2f,%s") % std::abs(mag_var)
% (mag_var > 0 ? "E" : "W")));
}
diff --git a/host/lib/usrp/x300/x300_dboard_iface.cpp b/host/lib/usrp/x300/x300_dboard_iface.cpp
index 3fc5921c6..6986ee8ab 100644
--- a/host/lib/usrp/x300/x300_dboard_iface.cpp
+++ b/host/lib/usrp/x300/x300_dboard_iface.cpp
@@ -56,7 +56,7 @@ void x300_dboard_iface::set_clock_rate(unit_t unit, double rate)
if (unit == UNIT_BOTH) throw uhd::runtime_error("UNIT_BOTH not supported.");
// Just return if the requested rate is already set
- if (std::fabs(_clock_rates[unit] - rate) < std::numeric_limits<double>::epsilon())
+ if (std::abs(_clock_rates[unit] - rate) < std::numeric_limits<double>::epsilon())
return;
switch(unit)