diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-21 14:42:44 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-21 14:42:44 +0000 |
| commit | faa0d10b5a762782d64ee3dce20ed2f37a488896 (patch) | |
| tree | 784f3a7d4a753e82afb25b7f18b2bde12a7f583d /libcxx/include/new | |
| parent | 8ae86dbe4739115c923f1a7582e34cf23eb02385 (diff) | |
| download | bcm5719-llvm-faa0d10b5a762782d64ee3dce20ed2f37a488896.tar.gz bcm5719-llvm-faa0d10b5a762782d64ee3dce20ed2f37a488896.zip | |
Revert accidentally changes which reverted r292582
llvm-svn: 292717
Diffstat (limited to 'libcxx/include/new')
| -rw-r--r-- | libcxx/include/new | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/new b/libcxx/include/new index 6e43501d299..86428f281dc 100644 --- a/libcxx/include/new +++ b/libcxx/include/new @@ -145,7 +145,7 @@ public: #endif // defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11) -#ifndef _LIBCPP_HAS_NO_ALIGNED_ALLOCATION +#if !defined(_LIBCPP_HAS_NO_ALIGNED_ALLOCATION) || _LIBCPP_STD_VER > 14 #ifndef _LIBCPP_CXX03_LANG enum class _LIBCPP_ENUM_VIS align_val_t : size_t { }; #else |
