This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] libstdc++/31031
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 03 Mar 2007 20:36:49 +0100
- Subject: [v3] libstdc++/31031
Hi,
tested x86-linux, committed to mainline (will go in 4_2-branch too).
Paolo.
////////////////////
2007-03-03 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/31031
* include/bits/istream.tcc: Inhibit implicit instantiation of
the _M_insert helpers.
* include/bits/ostream.tcc: Likewise for _M_extract.
* testsuite/27_io/basic_ostream/inserters_arithmetic/char/
31031.cc: New.
* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/
31031.cc: Likewise.
Index: include/bits/istream.tcc
===================================================================
--- include/bits/istream.tcc (revision 122504)
+++ include/bits/istream.tcc (working copy)
@@ -999,6 +999,20 @@
extern template istream& operator>>(istream&, unsigned char*);
extern template istream& operator>>(istream&, signed char*);
+ extern template istream& istream::_M_extract(unsigned short&);
+ extern template istream& istream::_M_extract(unsigned int&);
+ extern template istream& istream::_M_extract(long&);
+ extern template istream& istream::_M_extract(unsigned long&);
+ extern template istream& istream::_M_extract(bool&);
+#ifdef _GLIBCXX_USE_LONG_LONG
+ extern template istream& istream::_M_extract(long long&);
+ extern template istream& istream::_M_extract(unsigned long long&);
+#endif
+ extern template istream& istream::_M_extract(float&);
+ extern template istream& istream::_M_extract(double&);
+ extern template istream& istream::_M_extract(long double&);
+ extern template istream& istream::_M_extract(void*&);
+
extern template class basic_iostream<char>;
#ifdef _GLIBCXX_USE_WCHAR_T
@@ -1007,6 +1021,20 @@
extern template wistream& operator>>(wistream&, wchar_t&);
extern template wistream& operator>>(wistream&, wchar_t*);
+ extern template wistream& wistream::_M_extract(unsigned short&);
+ extern template wistream& wistream::_M_extract(unsigned int&);
+ extern template wistream& wistream::_M_extract(long&);
+ extern template wistream& wistream::_M_extract(unsigned long&);
+ extern template wistream& wistream::_M_extract(bool&);
+#ifdef _GLIBCXX_USE_LONG_LONG
+ extern template wistream& wistream::_M_extract(long long&);
+ extern template wistream& wistream::_M_extract(unsigned long long&);
+#endif
+ extern template wistream& wistream::_M_extract(float&);
+ extern template wistream& wistream::_M_extract(double&);
+ extern template wistream& wistream::_M_extract(long double&);
+ extern template wistream& wistream::_M_extract(void*&);
+
extern template class basic_iostream<wchar_t>;
#endif
#endif
Index: include/bits/ostream.tcc
===================================================================
--- include/bits/ostream.tcc (revision 122504)
+++ include/bits/ostream.tcc (working copy)
@@ -365,6 +365,17 @@
extern template ostream& operator<<(ostream&, const unsigned char*);
extern template ostream& operator<<(ostream&, const signed char*);
+ extern template ostream& ostream::_M_insert(long);
+ extern template ostream& ostream::_M_insert(unsigned long);
+ extern template ostream& ostream::_M_insert(bool);
+#ifdef _GLIBCXX_USE_LONG_LONG
+ extern template ostream& ostream::_M_insert(long long);
+ extern template ostream& ostream::_M_insert(unsigned long long);
+#endif
+ extern template ostream& ostream::_M_insert(double);
+ extern template ostream& ostream::_M_insert(long double);
+ extern template ostream& ostream::_M_insert(const void*);
+
#ifdef _GLIBCXX_USE_WCHAR_T
extern template class basic_ostream<wchar_t>;
extern template wostream& endl(wostream&);
@@ -374,8 +385,19 @@
extern template wostream& operator<<(wostream&, char);
extern template wostream& operator<<(wostream&, const wchar_t*);
extern template wostream& operator<<(wostream&, const char*);
+
+ extern template wostream& wostream::_M_insert(long);
+ extern template wostream& wostream::_M_insert(unsigned long);
+ extern template wostream& wostream::_M_insert(bool);
+#ifdef _GLIBCXX_USE_LONG_LONG
+ extern template wostream& wostream::_M_insert(long long);
+ extern template wostream& wostream::_M_insert(unsigned long long);
#endif
+ extern template wostream& wostream::_M_insert(double);
+ extern template wostream& wostream::_M_insert(long double);
+ extern template wostream& wostream::_M_insert(const void*);
#endif
+#endif
_GLIBCXX_END_NAMESPACE
Index: testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/31031.cc
===================================================================
--- testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/31031.cc (revision 0)
+++ testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/31031.cc (revision 0)
@@ -0,0 +1,52 @@
+// { dg-do compile }
+
+// 2007-03-03 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+#include <sstream>
+
+class MyClass
+{
+ double x;
+
+public:
+ MyClass(double X) : x(X) {}
+ friend bool operator&&(int i, const MyClass& Z);
+};
+
+inline bool
+operator&&(int i, const MyClass& Z)
+{ return int(Z.x) == i; }
+
+// libstdc++/31031
+void test01()
+{
+ int k =3;
+ MyClass X(3.1);
+ std::wostringstream oss;
+
+ oss << (k && X);
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
Index: testsuite/27_io/basic_ostream/inserters_arithmetic/char/31031.cc
===================================================================
--- testsuite/27_io/basic_ostream/inserters_arithmetic/char/31031.cc (revision 0)
+++ testsuite/27_io/basic_ostream/inserters_arithmetic/char/31031.cc (revision 0)
@@ -0,0 +1,52 @@
+// { dg-do compile }
+
+// 2007-03-03 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2007 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+#include <iostream>
+
+class MyClass
+{
+ double x;
+
+public:
+ MyClass(double X) : x(X) {}
+ friend bool operator&&(int i, const MyClass& Z);
+};
+
+inline bool
+operator&&(int i, const MyClass& Z)
+{ return int(Z.x) == i; }
+
+// libstdc++/31031
+void test01()
+{
+ int k =3;
+ MyClass X(3.1);
+ std::ostringstream oss;
+
+ oss << (k && X);
+}
+
+int main()
+{
+ test01();
+ return 0;
+}