FEX-Emu/vixl
1
0
Fork 0
mirror of https://github.com/FEX-Emu/vixl.git synced 2024-11-23 14:40:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a call to std::max seen as ambiguous and breaking compilation on OSX.

Browse Source 
Change-Id: I0ed0b2711602e71e0240d527b695812ad9e1f4c4
This commit is contained in:
Alexandre Rames 2016-07-28 08:32:33 +01:00
parent dd35b95cf7
commit 03b5c8da53
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/aarch64/abi-aarch64.h
View File

@ -87,7 +87,7 @@ class ABI {
const bool is_floating_point_type = std::is_floating_point<T>::value;
const bool is_integral_type = std::is_integral<T>::value;
const bool is_pointer_type = std::is_pointer<T>::value;
size_t type_alignment = std::alignment_of<T>::value;
int type_alignment = std::alignment_of<T>::value;
// We only support basic types.
VIXL_ASSERT(is_floating_point_type || is_integral_type || is_pointer_type);
@ -133,8 +133,7 @@ class ABI {
// Stage C.11
NGRN_ = 8;
// Stage C.12
stack_offset_ =
AlignUp(stack_offset_, std::max(type_alignment, UINT64_C(8)));
stack_offset_ = AlignUp(stack_offset_, std::max(type_alignment, 8));
// Stage C.13: Unsupported. Caught by the assertions above.
// Stage C.14
VIXL_ASSERT(size <= 8u);