[libcxx] r328185 - Correct TEST_HAS_NO_ALIGNED_ALLOCATION macro definition

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Wed Mar 21 23:21:07 PDT 2018


Author: ericwf
Date: Wed Mar 21 23:21:07 2018
New Revision: 328185

URL: http://llvm.org/viewvc/llvm-project?rev=328185&view=rev
Log:
Correct TEST_HAS_NO_ALIGNED_ALLOCATION macro definition

Modified:
    libcxx/trunk/test/support/test_macros.h

Modified: libcxx/trunk/test/support/test_macros.h
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/test_macros.h?rev=328185&r1=328184&r2=328185&view=diff
==============================================================================
--- libcxx/trunk/test/support/test_macros.h (original)
+++ libcxx/trunk/test/support/test_macros.h Wed Mar 21 23:21:07 2018
@@ -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
 




More information about the cfe-commits mailing list