From: Marshall Clow <mclow.lists@gmail.com>
Date: Fri, 14 Dec 2018 19:25:22 +0000 (+0000)
Subject: When resolving a merge conflict, I put something inside an #ifdef. Fixed.
X-Git-Tag: llvmorg-8.0.0-rc1~2080
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cac3d118ae775647f432c2d0159eca562c486744;p=platform%2Fupstream%2Fllvm.git

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

llvm-svn: 349181
---

diff --git a/libcxx/include/version b/libcxx/include/version
index 552d663..d6ccb13 100644
--- 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