From b3245b1e18c6060b7dc6c6a9c1704f94d9ee5cd0 Mon Sep 17 00:00:00 2001 From: Kleto Zan Date: Wed, 19 Aug 2020 10:00:03 -0300 Subject: [PATCH] Fix compiler warnings --- atomicops.h | 4 ++-- tests/unittests/unittests.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atomicops.h b/atomicops.h index 0d80059..89d65b3 100644 --- a/atomicops.h +++ b/atomicops.h @@ -537,8 +537,8 @@ namespace moodycamel const int usecs_in_1_sec = 1000000; const int nsecs_in_1_sec = 1000000000; clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_sec += (time_t)(usecs / usecs_in_1_sec); - ts.tv_nsec += (long)(usecs % usecs_in_1_sec) * 1000; + ts.tv_sec += static_cast(usecs / usecs_in_1_sec); + ts.tv_nsec += static_cast(usecs % usecs_in_1_sec) * 1000; // sem_timedwait bombs if you have more than 1e9 in tv_nsec // so we have to clean things up before passing it in if (ts.tv_nsec >= nsecs_in_1_sec) { diff --git a/tests/unittests/unittests.cpp b/tests/unittests/unittests.cpp index c838d99..8a2703d 100644 --- a/tests/unittests/unittests.cpp +++ b/tests/unittests/unittests.cpp @@ -452,7 +452,7 @@ class ReaderWriterQueueTests : public TestClass fence(memory_order_release); front = front.load() + 1; } - int size = (int)q.size_approx(); + int size = static_cast(q.size_approx()); fence(memory_order_acquire); int tail_ = tail.load(); int front_ = front.load(); @@ -469,7 +469,7 @@ class ReaderWriterQueueTests : public TestClass int tail_ = tail.load(); int front_ = front.load(); fence(memory_order_acquire); - int size = (int)q.size_approx(); + int size = static_cast(q.size_approx()); if (size > tail_ - front_ || size < 0) { result = 0; } @@ -487,7 +487,7 @@ class ReaderWriterQueueTests : public TestClass { // this math for queue size estimation is only valid for q_size <= 256 for (size_t q_size = 2; q_size < 256; ++q_size) { - ReaderWriterQueue q(q_size); + ReaderWriterQueue q(q_size); ASSERT_OR_FAIL(q.max_capacity() == ceilToPow2(q_size+1)-1); const size_t start_cap = q.max_capacity();