From 5d4624983ddf0008581ddd9975152a5f314f7e1c Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Thu, 22 Mar 2018 06:21:07 +0000 Subject: [PATCH] Correct TEST_HAS_NO_ALIGNED_ALLOCATION macro definition llvm-svn: 328185 --- libcxx/test/support/test_macros.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index 06800bdd..42eed4c 100644 --- a/libcxx/test/support/test_macros.h +++ b/libcxx/test/support/test_macros.h @@ -157,8 +157,9 @@ #define TEST_NORETURN [[noreturn]] #endif -#if !defined(__cpp_aligned_new) || __cpp_aligned_new < 201606L || \ - defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) +#if defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) || \ + (!(TEST_STD_VER > 14 || \ + (defined(__cpp_aligned_new) && __cpp_aligned_new >= 201606L))) #define TEST_HAS_NO_ALIGNED_ALLOCATION #endif -- 2.7.4