From: Jonathan Wakely Date: Mon, 1 Aug 2016 16:06:03 +0000 (+0100) Subject: Disable std::string and std::wstring extern templates for C++17 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f86525ae07131b2cb6ec0fe22243b49ca63490c;p=gcc.git Disable std::string and std::wstring extern templates for C++17 * include/bits/basic_string.tcc: Disable explicit instantiation declarations for C++17. From-SVN: r238959 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index eca470bb028..c172b01c339 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2016-08-01 Jonathan Wakely + * include/bits/basic_string.tcc: Disable explicit instantiation + declarations for C++17. + * testsuite/23_containers/unordered_map/requirements/53339.cc: Remove ignored "xfail" from { dg-do compile { xfail selector } } directive. * testsuite/23_containers/unordered_multimap/requirements/53339.cc: diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 2b6644d1c49..0560b466d73 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -1569,7 +1569,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Inhibit implicit instantiations for required instantiations, // which are defined via explicit instantiations elsewhere. -#if _GLIBCXX_EXTERN_TEMPLATE > 0 +#if _GLIBCXX_EXTERN_TEMPLATE > 0 && __cplusplus <= 201402L extern template class basic_string; extern template basic_istream&