diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-07-19 07:02:49 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-07-19 07:02:49 +0000 |
| commit | 97a708bebca0e58714a1e005445ff28d0c1c2ca5 (patch) | |
| tree | ca5965646804934581ceb1c2894df9431a357e8c /include/algorithm | |
| parent | 289ae9e3ac13cefd468cfb852e8b9f52e984de08 (diff) | |
Vendor import of libc++ trunk r308421:vendor/libc++/libc++-trunk-r308421
Diffstat (limited to 'include/algorithm')
| -rw-r--r-- | include/algorithm | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/algorithm b/include/algorithm index 9fe0361e577d..4542275adfda 100644 --- a/include/algorithm +++ b/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 |