Author: ericwf
Date: Fri Jan 20 01:53:20 2017
New Revision: 292586
URL: http://llvm.org/viewvc/llvm-project?rev=292586&view=rev
Log:
Merge r292582 - Still expose std::align_val_t in C++17 even if we don't have
aligned new/delete.
r292564 disabled the aligned new/delete overloads on platforms without
posix_memalign. Unfortunately that patch also disabled the align_val_t
definition in C++17 as well.
Modified:
libcxx/branches/release_40/include/new
Modified: libcxx/branches/release_40/include/new
URL:
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/include/new?rev=292586&r1=292585&r2=292586&view=diff
==============================================================================
--- libcxx/branches/release_40/include/new (original)
+++ libcxx/branches/release_40/include/new Fri Jan 20 01:53:20 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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
