diff options
author | Brent Stapleton <brent.stapleton@ettus.com> | 2019-11-18 14:39:12 +0530 |
---|---|---|
committer | Brent Stapleton <brent.stapleton@ettus.com> | 2020-01-09 09:18:25 -0800 |
commit | 708840002eef7104d930e2b25f0d9ca203c5d507 (patch) | |
tree | 3b19d154d445b18813e8facadd01479a17070423 /host/lib/include/uhdlib/utils | |
parent | d1398bbab629042bf62d4fda93ed503e54cadc7d (diff) | |
download | uhd-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/lib/include/uhdlib/utils')
-rw-r--r-- | host/lib/include/uhdlib/utils/isatty.hpp | 3 | ||||
-rw-r--r-- | host/lib/include/uhdlib/utils/rpc.hpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/host/lib/include/uhdlib/utils/isatty.hpp b/host/lib/include/uhdlib/utils/isatty.hpp index 1ae2c8de4..cb8d07afb 100644 --- a/host/lib/include/uhdlib/utils/isatty.hpp +++ b/host/lib/include/uhdlib/utils/isatty.hpp @@ -8,6 +8,7 @@ #define INCLUDED_UHDLIB_UTILS_ISATTY_HPP #include <uhd/config.hpp> +#include <uhdlib/utils/narrow.hpp> namespace uhd { @@ -23,7 +24,7 @@ namespace uhd { */ bool is_a_tty(const int fd) { - return _isatty(fd); + return uhd::narrow_cast<bool>(_isatty(fd)); } #elif _POSIX_C_SOURCE >= _200112L diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp index 066c6d144..6a45ba61f 100644 --- a/host/lib/include/uhdlib/utils/rpc.hpp +++ b/host/lib/include/uhdlib/utils/rpc.hpp @@ -1,5 +1,6 @@ // // Copyright 2017 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, A National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -305,9 +306,9 @@ private: } try { return _client->call(_get_last_error_cmd).as<std::string>(); - } catch (const ::rpc::rpc_error& ex) { + } catch (const ::rpc::rpc_error&) { // nop - } catch (const std::bad_cast& ex) { + } catch (const std::bad_cast&) { // nop } catch (...) { // nop |