re PR libstdc++/31031 (ostream ambiguous operator&&)
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. From-SVN: r122513
This commit is contained in:
Paolo Carlini
Paolo Carlini
parent
695d883001
commit
f12409e6ec
@ -1,3 +1,14 @@
|
||||
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.
|
||||
|
||||
2007-03-03 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* include/debug/functions.h: Use cstddef.
|
||||
|
||||
@ -999,6 +999,20 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||
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 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||
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
|
||||
|
||||
@ -365,6 +365,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||
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,6 +385,17 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||
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
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user