aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2004-01-27 12:37:37 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2004-01-27 12:37:37 +0000
commit51b6facb1aad0114201484c0c0812115355d2a62 (patch)
treec80d7ed040ba029db61904bde4dec49c7bd3b73a /libstdc++-v3
parent895ea8f080abe5d2b456152cdc49277db059e655 (diff)
downloadgcc-51b6facb1aad0114201484c0c0812115355d2a62.zip
gcc-51b6facb1aad0114201484c0c0812115355d2a62.tar.gz
gcc-51b6facb1aad0114201484c0c0812115355d2a62.tar.bz2
re PR libstdc++/13884 (Protect sstream.tcc from extern template use)
2004-01-27 Paolo Carlini <pcarlini@suse.de> PR libstdc++/13884 * include/bits/sstream.tcc: Guard use of extern template. From-SVN: r76698
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/sstream.tcc2
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b3a706f..d3c763e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2004-01-27 Paolo Carlini <pcarlini@suse.de>
+ PR libstdc++/13884
+ * include/bits/sstream.tcc: Guard use of extern template.
+
+2004-01-27 Paolo Carlini <pcarlini@suse.de>
+
* include/bits/basic_string.tcc
(basic_string(const basic_string&, size_type, size_type),
basic_string(const basic_string&, size_type, size_type,
diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc
index 07e1392..b3db928 100644
--- a/libstdc++-v3/include/bits/sstream.tcc
+++ b/libstdc++-v3/include/bits/sstream.tcc
@@ -205,6 +205,7 @@ namespace std
// Inhibit implicit instantiations for required instantiations,
// which are defined via explicit instantiations elsewhere.
// NB: This syntax is a GNU extension.
+#if _GLIBCXX_EXTERN_TEMPLATE
extern template class basic_stringbuf<char>;
extern template class basic_istringstream<char>;
extern template class basic_ostringstream<char>;
@@ -216,6 +217,7 @@ namespace std
extern template class basic_ostringstream<wchar_t>;
extern template class basic_stringstream<wchar_t>;
#endif
+#endif
} // namespace std
#endif