summaryrefslogtreecommitdiffstats
path: root/libcxx/include/string
diff options
context:
space:
mode:
authorShoaib Meenai <smeenai@fb.com>2017-07-14 03:56:54 +0000
committerShoaib Meenai <smeenai@fb.com>2017-07-14 03:56:54 +0000
commit316a3e572e363f12a780a531d0cb47fe9bfdcd83 (patch)
tree3205ba11937e1cebfcba3251b571262cf8881b99 /libcxx/include/string
parent21599fe2de2668d9310e204be23dc8bb85b78535 (diff)
downloadbcm5719-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/string')
-rw-r--r--libcxx/include/string7
1 files changed, 0 insertions, 7 deletions
diff --git a/libcxx/include/string b/libcxx/include/string
index 97fb4a1e225..cf42f529c70 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -578,14 +578,7 @@ __basic_string_common<__b>::__throw_out_of_range() const
_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>)
-#ifdef _LIBCPP_MSVC
-#pragma warning( pop )
-#endif // _LIBCPP_MSVC
#ifdef _LIBCPP_NO_EXCEPTIONS
template <class _Iter>
OpenPOWER on IntegriCloud