llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-23 18:38:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

When resolving a merge conflict, I put something inside an #ifdef. Fixed.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@349181 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2018-12-14 19:25:22 +00:00
parent f927635d87
commit 09e67411b7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/version
View File

@@ -121,8 +121,8 @@ __cpp_lib_void_t 201411L <type_traits>
#if _LIBCPP_STD_VER > 17 #if _LIBCPP_STD_VER > 17
#ifndef _LIBCPP_NO_HAS_CHAR8_T #ifndef _LIBCPP_NO_HAS_CHAR8_T
# define __cpp_lib_char8_t 201811L # define __cpp_lib_char8_t 201811L
#define __cpp_lib_erase_if 201811L
#endif #endif
#define __cpp_lib_erase_if 201811L
#endif #endif
#endif // _LIBCPP_VERSIONH #endif // _LIBCPP_VERSIONH