Skip to content

Silence a sign conversion warning #17

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

Open
mqtthiqs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Silence a sign conversion warning #17

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
20 changes: 10 additions & 10 deletions include/farbot/detail/RealtimeObject.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public:

void realtimeRelease() noexcept
{
auto idx = acquireIndex();
size_t idx = acquireIndex();
data[idx] = realtimeCopy;
releaseIndex(idx);
}
Expand All @@ -201,12 +201,12 @@ public:
const T& nonRealtimeAcquire()
{
nonRealtimeLock.lock();
auto current = control.load(std::memory_order_acquire);
size_t current = control.load(std::memory_order_acquire);

// there is new data so flip the indices around atomically ensuring we are not inside realtimeAssign
if ((current & NEWDATA_BIT) != 0)
{
int newValue;
size_t newValue;

do
{
Expand Down Expand Up @@ -250,24 +250,24 @@ private:
: data ({T (std::forward (args)...), T (std::forward (args)...)}), realtimeCopy (std::forward (args)...)
{}

enum
enum : size_t
{
INDEX_BIT = (1 << 0),
BUSY_BIT = (1 << 1),
NEWDATA_BIT = (1 << 2)
INDEX_BIT = (1U << 0),
BUSY_BIT = (1U << 1),
NEWDATA_BIT = (1U << 2)
};

int acquireIndex() noexcept
size_t acquireIndex() noexcept
{
return control.fetch_or (BUSY_BIT, std::memory_order_acquire) & INDEX_BIT;
}

void releaseIndex(int idx) noexcept
void releaseIndex(size_t idx) noexcept
{
control.store ((idx & INDEX_BIT) | NEWDATA_BIT, std::memory_order_release);
}

std::atomic<int> control = {0};
std::atomic<size_t> control = {0};

std::array<T, 2> data;
T realtimeCopy;
Expand Down