[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.) git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@307997 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -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);
|
_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<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<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>&))
|
_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 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>&))
|
_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
|
// lower_bound
|
||||||
|
|
||||||
|
|||||||
@@ -578,14 +578,7 @@ __basic_string_common<__b>::__throw_out_of_range() const
|
|||||||
_VSTD::__throw_out_of_range("basic_string");
|
_VSTD::__throw_out_of_range("basic_string");
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _LIBCPP_MSVC
|
|
||||||
#pragma warning( push )
|
|
||||||
#pragma warning( disable: 4231 )
|
|
||||||
#endif // _LIBCPP_MSVC
|
|
||||||
_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __basic_string_common<true>)
|
_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __basic_string_common<true>)
|
||||||
#ifdef _LIBCPP_MSVC
|
|
||||||
#pragma warning( pop )
|
|
||||||
#endif // _LIBCPP_MSVC
|
|
||||||
|
|
||||||
#ifdef _LIBCPP_NO_EXCEPTIONS
|
#ifdef _LIBCPP_NO_EXCEPTIONS
|
||||||
template <class _Iter>
|
template <class _Iter>
|
||||||
|
|||||||
@@ -310,14 +310,7 @@ __vector_base_common<__b>::__throw_out_of_range() const
|
|||||||
_VSTD::__throw_out_of_range("vector");
|
_VSTD::__throw_out_of_range("vector");
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _LIBCPP_MSVC
|
|
||||||
#pragma warning( push )
|
|
||||||
#pragma warning( disable: 4231 )
|
|
||||||
#endif // _LIBCPP_MSVC
|
|
||||||
_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __vector_base_common<true>)
|
_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __vector_base_common<true>)
|
||||||
#ifdef _LIBCPP_MSVC
|
|
||||||
#pragma warning( pop )
|
|
||||||
#endif // _LIBCPP_MSVC
|
|
||||||
|
|
||||||
template <class _Tp, class _Allocator>
|
template <class _Tp, class _Allocator>
|
||||||
class __vector_base
|
class __vector_base
|
||||||
|
|||||||
Reference in New Issue
Block a user