diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2018-08-14 12:37:32 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2018-08-14 11:47:24 +0000 |
| commit | 22baf58174515a8886eb0f6fec7238b8e7df72fb (patch) | |
| tree | d52e4f891e6af4fd99f9925d3dc59effba9f6883 /src/3rdparty | |
| parent | 414d8f65786ed3d2020dd85965224a59068a0d5d (diff) | |
Fix udis86 compilation
It's compiled as a C file, so reinterpret_cast and nullptr cannot be
used.
Change-Id: I864a400f3752a4de51775a443a3049365bf2c5c1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/wtf/Assertions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/masm/wtf/Assertions.h b/src/3rdparty/masm/wtf/Assertions.h index e2c04ac0bb..be25d43826 100644 --- a/src/3rdparty/masm/wtf/Assertions.h +++ b/src/3rdparty/masm/wtf/Assertions.h @@ -171,7 +171,7 @@ WTF_EXPORT_PRIVATE void WTFInstallReportBacktraceOnCrashHook(); #define CRASH() \ (WTFReportBacktrace(), \ WTFInvokeCrashHook(), \ - (*reinterpret_cast<int *>(uintptr_t(0xbbadbeef)) = 0), \ + (*(int *)(uintptr_t)0xbbadbeef = 0), \ __builtin_trap()) #else #define CRASH() \ @@ -256,7 +256,7 @@ inline void assertUnused(T& x) { (void)x; } (void)0) #define ASSERT_NOT_REACHED() do { \ - WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, nullptr); \ + WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, NULL); \ CRASH(); \ } while (0) |