diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 00:01:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 00:01:31 +0200 |
| commit | e33080767e73c1fe9156a5423ff4a7c3e00e8470 (patch) | |
| tree | 3bfb5c17674bf475943fb807b9a063728ea65047 /src/3rdparty | |
| parent | 36ea464b3dcce6319c5252553d48dd5ac6ba8f41 (diff) | |
| parent | e47bd1fc0e6fc2b2e3ca82c48ccb2f8f7dd5ee92 (diff) | |
Merge dev into 5.12
Change-Id: Ib4dd56aa31ea0f2026b61dbae061d0b333426d0f
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) |