diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2018-12-14 19:25:22 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2018-12-14 19:25:22 +0000 |
| commit | cac3d118ae775647f432c2d0159eca562c486744 (patch) | |
| tree | da15120620bc2f79bd82f7c8fdf048920695683f /libcxx | |
| parent | 82694abac725612258640e17d9dd1b635c704ceb (diff) | |
| download | bcm5719-llvm-cac3d118ae775647f432c2d0159eca562c486744.tar.gz bcm5719-llvm-cac3d118ae775647f432c2d0159eca562c486744.zip | |
When resolving a merge conflict, I put something inside an #ifdef. Fixed.
llvm-svn: 349181
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/version b/libcxx/include/version index 552d663d052..d6ccb138f6e 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 |
