Commit d13f57a1 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r201843

------------------------------------------------------------------------
r201843 | chandlerc | 2014-02-21 00:37:30 -0800 (Fri, 21 Feb 2014) | 4 lines

Teach libc++ to use the compiler-provided C-compatible ::max_align_t
rather than its own type for std::max_align_t. This is particularly
relevant as the types may not be ABI compatible despite users expecting
them to be.
------------------------------------------------------------------------

llvm-svn: 209032
parent e14d8597
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -52,7 +52,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD
using ::ptrdiff_t;
using ::size_t;

#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T)
// Re-use the compiler's <stddef.h> max_align_t where possible.
using ::max_align_t;
#else
typedef long double max_align_t;
#endif

#ifdef _LIBCPP_HAS_NO_NULLPTR