projects
/
webkit2gtk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25b86f6
)
Use ternary operator instead of std::max()
author
Tomas Popela
<tpopela@redhat.com>
Fri, 14 Sep 2018 18:23:00 +0000
(19:23 +0100)
committer
Alberto Garcia
<berto@igalia.com>
Fri, 14 Sep 2018 18:23:00 +0000
(19:23 +0100)
===================================================================
Gbp-Pq: Name replace-stdmax.patch
Source/JavaScriptCore/heap/RegisterState.h
patch
|
blob
|
history
diff --git
a/Source/JavaScriptCore/heap/RegisterState.h
b/Source/JavaScriptCore/heap/RegisterState.h
index baaef4c7857be85413804448ec87951db3f20989..b3037dba18cf4d9bc5ab5c25168d7670a5731d29 100644
(file)
--- 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)