diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-03-22 06:21:07 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-03-22 06:21:07 +0000 |
| commit | 5d4624983ddf0008581ddd9975152a5f314f7e1c (patch) | |
| tree | 504eea6472d3a3303d3d67e51cb2be0648eedebc /libcxx/test/support/test_macros.h | |
| parent | 195aaaf5417ec535591a2286dc999a2f672b94c2 (diff) | |
| download | bcm5719-llvm-5d4624983ddf0008581ddd9975152a5f314f7e1c.tar.gz bcm5719-llvm-5d4624983ddf0008581ddd9975152a5f314f7e1c.zip | |
Correct TEST_HAS_NO_ALIGNED_ALLOCATION macro definition
llvm-svn: 328185
Diffstat (limited to 'libcxx/test/support/test_macros.h')
| -rw-r--r-- | libcxx/test/support/test_macros.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index 06800bdd341..42eed4ce498 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 |
