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:
82694ab
)
When resolving a merge conflict, I put something inside an #ifdef. Fixed.
author
Marshall Clow
<mclow.lists@gmail.com>
Fri, 14 Dec 2018 19:25:22 +0000
(19:25 +0000)
committer
Marshall Clow
<mclow.lists@gmail.com>
Fri, 14 Dec 2018 19:25:22 +0000
(19:25 +0000)
llvm-svn: 349181
libcxx/include/version
patch
|
blob
|
history
diff --git
a/libcxx/include/version
b/libcxx/include/version
index
552d663
..
d6ccb13
100644
(file)
--- a/
libcxx/include/version
+++ b/
libcxx/include/version
@@
-121,8
+121,8
@@
__cpp_lib_void_t 201411L <type_traits>
#if _LIBCPP_STD_VER > 17
#ifndef _LIBCPP_NO_HAS_CHAR8_T
# define __cpp_lib_char8_t 201811L
-#define __cpp_lib_erase_if 201811L
#endif
+#define __cpp_lib_erase_if 201811L
#endif
#endif // _LIBCPP_VERSIONH