Skip to content

Fix compiler warnings #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cameron314 merged 1 commit into from
Aug 19, 2020
Merged

Fix compiler warnings #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions atomicops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<time_t>(usecs / usecs_in_1_sec);
ts.tv_nsec += static_cast<long>(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) {
Expand Down
6 changes: 3 additions & 3 deletions tests/unittests/unittests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ class ReaderWriterQueueTests : public TestClass<ReaderWriterQueueTests>
fence(memory_order_release);
front = front.load() + 1;
}
int size = (int)q.size_approx();
int size = static_cast<int>(q.size_approx());
fence(memory_order_acquire);
int tail_ = tail.load();
int front_ = front.load();
Expand All @@ -469,7 +469,7 @@ class ReaderWriterQueueTests : public TestClass<ReaderWriterQueueTests>
int tail_ = tail.load();
int front_ = front.load();
fence(memory_order_acquire);
int size = (int)q.size_approx();
int size = static_cast<int>(q.size_approx());
if (size > tail_ - front_ || size < 0) {
result = 0;
}
Expand All @@ -487,7 +487,7 @@ class ReaderWriterQueueTests : public TestClass<ReaderWriterQueueTests>
{
// 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<int> q(q_size);
ReaderWriterQueue<size_t> q(q_size);
ASSERT_OR_FAIL(q.max_capacity() == ceilToPow2(q_size+1)-1);

const size_t start_cap = q.max_capacity();
Expand Down