mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-23 18:38:30 +08:00
When resolving a merge conflict, I put something inside an #ifdef. Fixed.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@349181 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user