diff options
| author | Shoaib Meenai <smeenai@fb.com> | 2017-07-14 03:56:54 +0000 |
|---|---|---|
| committer | Shoaib Meenai <smeenai@fb.com> | 2017-07-14 03:56:54 +0000 |
| commit | 316a3e572e363f12a780a531d0cb47fe9bfdcd83 (patch) | |
| tree | 3205ba11937e1cebfcba3251b571262cf8881b99 /libcxx/include/algorithm | |
| parent | 21599fe2de2668d9310e204be23dc8bb85b78535 (diff) | |
| download | bcm5719-llvm-316a3e572e363f12a780a531d0cb47fe9bfdcd83.tar.gz bcm5719-llvm-316a3e572e363f12a780a531d0cb47fe9bfdcd83.zip | |
[libc++] Clean up cl warning 4231 disabling
Once upon a time, extern templates used to be a Microsoft extension, so
cl would warn about their usage, and libc++ suppressed that warning.
They've long since been standardized, so the warning is defunct. (libc++
also doesn't currently support building with cl anyway.)
llvm-svn: 307997
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 9fe0361e577..4542275adfd 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -4234,10 +4234,6 @@ sort(__wrap_iter<_Tp*> __first, __wrap_iter<_Tp*> __last, _Compare __comp) _VSTD::sort<_Tp*, _Comp_ref>(__first.base(), __last.base(), __comp); } -#ifdef _LIBCPP_MSVC -#pragma warning( push ) -#pragma warning( disable: 4231) -#endif // _LIBCPP_MSVC _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<char>&, char*>(char*, char*, __less<char>&)) _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<wchar_t>&, wchar_t*>(wchar_t*, wchar_t*, __less<wchar_t>&)) _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<signed char>&, signed char*>(signed char*, signed char*, __less<signed char>&)) @@ -4271,9 +4267,6 @@ _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long double>&, long double*>(long double*, long double*, __less<long double>&)) _LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS unsigned __sort5<__less<long double>&, long double*>(long double*, long double*, long double*, long double*, long double*, __less<long double>&)) -#ifdef _LIBCPP_MSVC -#pragma warning( pop ) -#endif // _LIBCPP_MSVC // lower_bound |
