diff options
| author | Wladimir J. van der Laan <[email protected]> | 2019-01-16 13:40:44 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2019-01-16 13:50:37 +0100 |
| commit | 19c60ca4975d5cf3847d5ba43c65eb02462c2d0f (patch) | |
| tree | 63a0a9ede9466ee01217bfd989d3c628966f2b9d /src/test/allocator_tests.cpp | |
| parent | Merge #14409: utils and libraries: Make 'blocksdir' always net specific (diff) | |
| parent | Fix remaining compiler warnings (MSVC). Move disabling of specific warnings f... (diff) | |
| download | discoin-19c60ca4975d5cf3847d5ba43c65eb02462c2d0f.tar.xz discoin-19c60ca4975d5cf3847d5ba43c65eb02462c2d0f.zip | |
Merge #14151: windows: Fix remaining compiler warnings (MSVC)
b9dafe7d9ffcbe7928ffbfba816b54e196c57664 Fix remaining compiler warnings (MSVC). Move disabling of specific warnings from /nowarn to project file. (practicalswift)
Pull request description:
Fix remaining compiler warnings (MSVC).
Before:
```
$ msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\bitcoin.sln /m /v:q /nowarn:C4244;C4267;C4715 /nologo
…\script\script.cpp(272): warning C4018: '>': signed/unsigned mismatch
…\test\allocator_tests.cpp(147): warning C4312: 'reinterpret_cast': conversion from 'int' to 'void *' of greater size
…\boost\test\tools\old\impl.hpp(107): warning C4805: '==': unsafe mix of type 'const Left' and type 'const Right' in operation
…\test\crypto_tests.cpp(535): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
…\test\script_tests.cpp(188): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
…\test\script_tests.cpp(190): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
…\test\script_tests.cpp(191): warning C4805: '==': unsafe mix of type 'int' and type 'bool' in operation
$
```
After:
```
$ msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\bitcoin.sln /m /v:q /nowarn:C4244;C4267;C4715;C4805 /nologo
$
```
Tree-SHA512: 5b30334d3804e869779e77dad75a799e8e5e7eb2e08634cd40035cce140edd623cbb6c8b5806d2158c3df97888d3ea9ff4b8b6a5a83de3fe2cb361e29588c115
Diffstat (limited to 'src/test/allocator_tests.cpp')
| -rw-r--r-- | src/test/allocator_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index 80328458c..9eded4f5b 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 nullptr; } |