aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-02-15 16:42:34 -0800
committerMichael West <michael.west@ettus.com>2019-03-05 10:32:24 -0800
commit91d2ef67d218d6c88ae690e75d4ab2e65b24fe54 (patch)
treef1946789879a7a0059461ba09059afaae7e58097
parent76376fc833831eb2584fd306a88d6e32c0043287 (diff)
downloaduhd-91d2ef67d218d6c88ae690e75d4ab2e65b24fe54.tar.gz
uhd-91d2ef67d218d6c88ae690e75d4ab2e65b24fe54.tar.bz2
uhd-91d2ef67d218d6c88ae690e75d4ab2e65b24fe54.zip
lib: Fix various type-conversion compiler warnings
This makes more type-conversions explicit, to reduce the number of warnings specifically for MSVC.
-rw-r--r--host/lib/rfnoc/ctrl_iface.cpp2
-rw-r--r--host/lib/rfnoc/ddc_block_ctrl_impl.cpp6
-rw-r--r--host/lib/rfnoc/nocscript/expression.cpp2
-rw-r--r--host/lib/rfnoc/nocscript/parser.cpp2
-rw-r--r--host/lib/types/serial.cpp4
5 files changed, 9 insertions, 7 deletions
diff --git a/host/lib/rfnoc/ctrl_iface.cpp b/host/lib/rfnoc/ctrl_iface.cpp
index a441ffbc3..377808eef 100644
--- a/host/lib/rfnoc/ctrl_iface.cpp
+++ b/host/lib/rfnoc/ctrl_iface.cpp
@@ -63,7 +63,7 @@ public:
boost::mutex::scoped_lock lock(_mutex);
this->send_pkt(addr, data, timestamp);
return this->wait_for_ack(
- readback, bool(timestamp) ? MASSIVE_TIMEOUT : ACK_TIMEOUT);
+ readback, bool(timestamp != 0) ? MASSIVE_TIMEOUT : ACK_TIMEOUT);
}
private:
diff --git a/host/lib/rfnoc/ddc_block_ctrl_impl.cpp b/host/lib/rfnoc/ddc_block_ctrl_impl.cpp
index 30f465098..d89719c65 100644
--- a/host/lib/rfnoc/ddc_block_ctrl_impl.cpp
+++ b/host/lib/rfnoc/ddc_block_ctrl_impl.cpp
@@ -169,8 +169,10 @@ public:
if (stream_cmd.stream_mode == uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE
or stream_cmd.stream_mode
== uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_MORE) {
- size_t decimation = get_arg<double>("input_rate", chan)
- / get_arg<double>("output_rate", chan);
+ const size_t decimation =
+ static_cast<size_t>(
+ get_arg<double>("input_rate", chan)
+ / get_arg<double>("output_rate", chan));
stream_cmd.num_samps *= decimation;
}
diff --git a/host/lib/rfnoc/nocscript/expression.cpp b/host/lib/rfnoc/nocscript/expression.cpp
index 32065bda1..5e03485be 100644
--- a/host/lib/rfnoc/nocscript/expression.cpp
+++ b/host/lib/rfnoc/nocscript/expression.cpp
@@ -49,7 +49,7 @@ expression_literal::expression_literal(
_bool_val = true;
} else {
// lexical cast to bool is too picky
- _bool_val = bool(std::stoi(_val));
+ _bool_val = (std::stoi(_val) != 0);
}
break;
diff --git a/host/lib/rfnoc/nocscript/parser.cpp b/host/lib/rfnoc/nocscript/parser.cpp
index 51a544e47..8ef1b7f44 100644
--- a/host/lib/rfnoc/nocscript/parser.cpp
+++ b/host/lib/rfnoc/nocscript/parser.cpp
@@ -163,7 +163,7 @@ private:
P.expr_stack.top()->set_combiner_safe(
expression_container::COMBINE_OR);
}
- } catch (const uhd::syntax_error& e) {
+ } catch (const uhd::syntax_error&) {
P.error = str(boost::format("Operator %s is mixing operator "
"types within this container.")
% val);
diff --git a/host/lib/types/serial.cpp b/host/lib/types/serial.cpp
index afa99d051..83f538f5e 100644
--- a/host/lib/types/serial.cpp
+++ b/host/lib/types/serial.cpp
@@ -59,7 +59,7 @@ byte_vector_t i2c_iface::read_eeprom(
byte_vector_t bytes;
for (size_t i = 0; i < num_bytes; i++){
//do a zero byte write to start read cycle
- this->write_i2c(addr, byte_vector_t(1, offset+i));
+ this->write_i2c(addr, byte_vector_t(1, narrow_cast<uint8_t>(offset+i)));
bytes.push_back(this->read_i2c(addr, 1).at(0));
}
return bytes;
@@ -105,7 +105,7 @@ struct eeprom16_impl : i2c_iface
uint16_t offset,
const byte_vector_t &bytes
){
- for (size_t i = 0; i < bytes.size(); i++)
+ for (uint16_t i = 0; i < bytes.size(); i++)
{
//write a byte at a time, its easy that way
uint16_t offset_i = offset+i;