aboutsummaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorBrent Stapleton <brent.stapleton@ettus.com>2019-11-18 14:39:12 +0530
committerBrent Stapleton <brent.stapleton@ettus.com>2020-01-09 09:18:25 -0800
commit708840002eef7104d930e2b25f0d9ca203c5d507 (patch)
tree3b19d154d445b18813e8facadd01479a17070423 /host/include
parentd1398bbab629042bf62d4fda93ed503e54cadc7d (diff)
downloaduhd-708840002eef7104d930e2b25f0d9ca203c5d507.tar.gz
uhd-708840002eef7104d930e2b25f0d9ca203c5d507.tar.bz2
uhd-708840002eef7104d930e2b25f0d9ca203c5d507.zip
uhd: fixing MSVC warnings
Small changes to remove various compiler warnings found in MSVC - Adding uhd::narrow_cast to verious spots - wavetable.hpp: all floats literals in the wavetable. - paths_test: unnecessary character escape - replay example: remove unreferenced noc_id - adfXXXX: Fixing qualifiers to match between parent and derived classes - rpc, block_id: Removing unused name in try...catch
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/rfnoc/traffic_counter.hpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/host/include/uhd/rfnoc/traffic_counter.hpp b/host/include/uhd/rfnoc/traffic_counter.hpp
index 9a0546f17..b30eff329 100644
--- a/host/include/uhd/rfnoc/traffic_counter.hpp
+++ b/host/include/uhd/rfnoc/traffic_counter.hpp
@@ -1,5 +1,6 @@
//
// Copyright 2018 Ettus Research, a National Instruments Company
+// Copyright 2019 Ettus Research, A National Instruments Brand
//
// SPDX-License-Identifier: GPL-3.0-or-later
//
@@ -8,6 +9,7 @@
#define INCLUDED_LIBUHD_TRAFFIC_COUNTER_HPP
#include <uhd/property_tree.hpp>
+#include <uhdlib/utils/narrow.hpp>
#include <stdint.h>
#include <type_traits>
#include <functional>
@@ -57,7 +59,8 @@ public:
for (size_t i = 0; i < std::extent<decltype(counters)>::value; i++) {
tree->create<uint64_t>(root_path / "traffic_counter" / counters[i])
.set_publisher([this, i, first_counter_offset]() {
- return _read_reg_fn(i + first_counter_offset);
+ return _read_reg_fn(
+ uhd::narrow_cast<uint32_t>(i) + first_counter_offset);
});
}
}