From 01d5bb242a6197e17e0ed466ed86e7ba42bd7d01 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Wed, 8 Oct 2014 17:39:45 +0400 Subject: [PATCH] Warning fixes --- libuavcan/test/marshal/float_spec.cpp | 2 +- libuavcan/test/transport/transfer_receiver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libuavcan/test/marshal/float_spec.cpp b/libuavcan/test/marshal/float_spec.cpp index 7a55aee944..eacc0522fe 100644 --- a/libuavcan/test/marshal/float_spec.cpp +++ b/libuavcan/test/marshal/float_spec.cpp @@ -68,7 +68,7 @@ TEST(FloatSpec, Basic) -std::numeric_limits::infinity(), nanl("") }; - static const int NumValues = sizeof(Values) / sizeof(Values[0]); + static const int NumValues = int(sizeof(Values) / sizeof(Values[0])); static const long double ValuesF16S[] = { diff --git a/libuavcan/test/transport/transfer_receiver.cpp b/libuavcan/test/transport/transfer_receiver.cpp index c6c3f6ab4d..e6c379d39e 100644 --- a/libuavcan/test/transport/transfer_receiver.cpp +++ b/libuavcan/test/transport/transfer_receiver.cpp @@ -322,7 +322,7 @@ TEST(TransferReceiver, IntervalMeasurement) ASSERT_EQ(0x3231, rcv.getLastTransferCrc()); ASSERT_EQ(timestamp, rcv.getLastTransferTimestampMonotonic().toUSec()); - timestamp += INTERVAL; + timestamp += uint64_t(INTERVAL); tid.increment(); }