aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/convert
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-06-19 00:06:52 +0200
committerAaron Rossetto <aaron.rossetto@ni.com>2021-06-24 12:00:49 -0500
commit188fbb17cfd18c87f60ec56f62476f97ef2779bb (patch)
treee88b9fb8436aa42f3ecbdc0403751a3e68bbbac8 /host/lib/convert
parent78ec29b6becd53f79a0ae282ae22c38bedb887d1 (diff)
downloaduhd-188fbb17cfd18c87f60ec56f62476f97ef2779bb.tar.gz
uhd-188fbb17cfd18c87f60ec56f62476f97ef2779bb.tar.bz2
uhd-188fbb17cfd18c87f60ec56f62476f97ef2779bb.zip
uhd: Remove all occurences of boost::math::*round()
Its behaviour is almost identical to std::lround, which we use instead. The only downside of std::lround is that it always returns a long, which we don't always need. We thus add some casts for those cases to make the compiler happy.
Diffstat (limited to 'host/lib/convert')
-rw-r--r--host/lib/convert/convert_with_tables.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/convert/convert_with_tables.cpp b/host/lib/convert/convert_with_tables.cpp
index 3df510092..3443e02c7 100644
--- a/host/lib/convert/convert_with_tables.cpp
+++ b/host/lib/convert/convert_with_tables.cpp
@@ -7,7 +7,7 @@
#include "convert_common.hpp"
#include <uhd/utils/byteswap.hpp>
-#include <boost/math/special_functions/round.hpp>
+#include <cmath>
#include <vector>
using namespace uhd::convert;
@@ -30,7 +30,7 @@ public:
{
for (size_t i = 0; i < sc16_table_len; i++) {
const int16_t val = uint16_t(i);
- _table[i] = int8_t(boost::math::iround(val * scalar / 32767.));
+ _table[i] = int8_t(std::lround(val * scalar / 32767.));
}
}
@@ -120,7 +120,7 @@ public:
static type conv(const int8_t& num, const double scalar)
{
if (sizeof(type) == sizeof(s16_t)) {
- return type(boost::math::iround(num * scalar * 32767));
+ return type(std::lround(num * scalar * 32767));
}
return type(num * scalar);
}