[libcxx] r292717 - Revert accidentally changes which reverted r292582

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Sat Jan 21 06:42:44 PST 2017


Author: ericwf
Date: Sat Jan 21 08:42:44 2017
New Revision: 292717

URL: http://llvm.org/viewvc/llvm-project?rev=292717&view=rev
Log:
Revert accidentally changes which reverted r292582

Modified:
    libcxx/trunk/include/new

Modified: libcxx/trunk/include/new
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/new?rev=292717&r1=292716&r2=292717&view=diff
==============================================================================
--- libcxx/trunk/include/new (original)
+++ libcxx/trunk/include/new Sat Jan 21 08:42:44 2017
@@ -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




More information about the cfe-commits mailing list