summaryrefslogtreecommitdiffhomepage
path: root/proto-ft
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-10-25 03:54:22 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-10-25 03:54:22 +0200
commit00cceaffca6063b963d0848480acaa99f5fecaad (patch)
treeb8cc3fd45f6e7838fe8d80c1a36136225116e97e /proto-ft
parent25b7bf6a9750f92bd75850740002d32dcf08470e (diff)
proto/ft: fix GCC warns
Diffstat (limited to 'proto-ft')
-rw-r--r--proto-ft/ftnoir_protocol_ft.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/proto-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp
index d1c7bf94..314bb451 100644
--- a/proto-ft/ftnoir_protocol_ft.cpp
+++ b/proto-ft/ftnoir_protocol_ft.cpp
@@ -42,13 +42,13 @@ cc_noinline void store(float volatile& place, const float value)
}
template<typename t>
-cc_forceinline void store(t volatile& place, t value)
+static void store(t volatile& place, t value)
{
static_assert(sizeof(t) == 4u);
(void)InterlockedExchange((LONG volatile*) &place, value);
}
-cc_forceinline std::int32_t load(std::int32_t volatile& place)
+static std::int32_t load(std::int32_t volatile& place)
{
return InterlockedCompareExchange((volatile LONG*) &place, 0, 0);
}
@@ -93,7 +93,7 @@ void freetrack::pose(const double* headpose)
{
// FTHeap pMemData happens to be aligned on a page boundary by virtue of
// memory mapping usage (MS Windows equivalent of mmap(2)).
- static_assert((offsetof(FTHeap, table) & sizeof(LONG)-1) == 0);
+ static_assert((offsetof(FTHeap, table) & (sizeof(LONG)-1)) == 0);
for (unsigned k = 0; k < 2; k++)
store(pMemData->table_ints[k], t.ints[k]);