projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ae86db
)
Revert accidentally changes which reverted r292582
author
Eric Fiselier
<eric@efcs.ca>
Sat, 21 Jan 2017 14:42:44 +0000
(14:42 +0000)
committer
Eric Fiselier
<eric@efcs.ca>
Sat, 21 Jan 2017 14:42:44 +0000
(14:42 +0000)
llvm-svn: 292717
libcxx/include/new
patch
|
blob
|
history
diff --git
a/libcxx/include/new
b/libcxx/include/new
index
6e43501
..
86428f2
100644
(file)
--- a/
libcxx/include/new
+++ b/
libcxx/include/new
@@
-145,7
+145,7
@@
public:
#endif // defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11)
-#if
ndef _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