aboutsummaryrefslogtreecommitdiff
path: root/src/test/allocator_tests.cpp
diff options
context:
space:
mode:
authorpracticalswift <practicalswift@users.noreply.github.com>2018-09-05 15:08:58 +0200
committerpracticalswift <practicalswift@users.noreply.github.com>2019-01-15 20:15:26 +0100
commitb9dafe7d9ffcbe7928ffbfba816b54e196c57664 (patch)
treeb2aa7f929c950e0434aebaae16a625afa0abcbfe /src/test/allocator_tests.cpp
parent9c719987718d9fcc3a689e50f5212acc7ead7606 (diff)
Fix remaining compiler warnings (MSVC). Move disabling of specific warnings from /nowarn to project file.
Diffstat (limited to 'src/test/allocator_tests.cpp')
-rw-r--r--src/test/allocator_tests.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp
index 5a108dcdad..582082f6a4 100644
--- a/src/test/allocator_tests.cpp
+++ b/src/test/allocator_tests.cpp
@@ -144,7 +144,7 @@ public:
*lockingSuccess = true;
}
- return reinterpret_cast<void*>(0x08000000 + (count<<24)); // Fake address, do not actually use this memory
+ return reinterpret_cast<void*>(uint64_t{static_cast<uint64_t>(0x08000000) + (count << 24)}); // Fake address, do not actually use this memory
}
return 0;
}