[libcxx] r349181 - When resolving a merge conflict, I put something inside an #ifdef. Fixed.

Marshall Clow mclow.lists at gmail.com
Fri Dec 14 11:25:22 PST 2018


Author: marshall
Date: Fri Dec 14 11:25:22 2018
New Revision: 349181

URL: http://llvm.org/viewvc/llvm-project?rev=349181&view=rev
Log:
When resolving a merge conflict, I put something inside an #ifdef. Fixed.

Modified:
    libcxx/trunk/include/version

Modified: libcxx/trunk/include/version
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/version?rev=349181&r1=349180&r2=349181&view=diff
==============================================================================
--- libcxx/trunk/include/version (original)
+++ libcxx/trunk/include/version Fri Dec 14 11:25:22 2018
@@ -121,8 +121,8 @@ __cpp_lib_void_t
 #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




More information about the libcxx-commits mailing list