From b6d6c711fbd088e7ef9aa12c986018c2633b733f Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 14 Sep 2018 19:23:00 +0100 Subject: [PATCH] Use ternary operator instead of std::max() =================================================================== Gbp-Pq: Name replace-stdmax.patch --- Source/JavaScriptCore/heap/RegisterState.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/JavaScriptCore/heap/RegisterState.h b/Source/JavaScriptCore/heap/RegisterState.h index baaef4c785..b3037dba18 100644 --- a/Source/JavaScriptCore/heap/RegisterState.h +++ b/Source/JavaScriptCore/heap/RegisterState.h @@ -166,7 +166,7 @@ using RegisterState = jmp_buf; #pragma warning(disable: 4611) #endif #define ALLOCATE_AND_GET_REGISTER_STATE(registers) \ - alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \ + alignas(alignof(void*) > alignof(RegisterState) ? alignof(void*) : alignof(RegisterState)) RegisterState registers; \ setjmp(registers) #if COMPILER(MSVC) -- 2.30.2