Revert recent commit for libstdc++/26211, now suspended waiting for DR 342 (reopened) to reach a new resolution.
2006-02-20 Paolo Carlini <pcarlini@suse.de> Revert recent commit for libstdc++/26211, now suspended waiting for DR 342 (reopened) to reach a new resolution. * include/bits/istream.tcc (basic_istream<>::tellg, seekg(pos_type), seekg(off_type, ios_base::seekdir)): Remove sentry. * testsuite/27_io/basic_istream/seekg/char/26211.cc: Remove. * testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc: Likewise. * testsuite/27_io/basic_istream/tellg/char/26211.cc: Likewise. * testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc: Likewise. * testsuite/27_io/basic_istream/seekg/char/8348-1.cc: Revert changes. * testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc: Likewise. * testsuite/27_io/basic_istream/seekg/char/8348-2.cc: Likewise. * testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc: Likewise. * testsuite/27_io/basic_istream/tellg/char/8348.cc: Likewise. * testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc: Likewise. From-SVN: r111302
This commit is contained in:
parent
3c90c9ae61
commit
c849c938da
|
@ -1,3 +1,20 @@
|
||||||
|
2006-02-20 Paolo Carlini <pcarlini@suse.de>
|
||||||
|
|
||||||
|
Revert recent commit for libstdc++/26211, now suspended waiting for
|
||||||
|
DR 342 (reopened) to reach a new resolution.
|
||||||
|
* include/bits/istream.tcc (basic_istream<>::tellg, seekg(pos_type),
|
||||||
|
seekg(off_type, ios_base::seekdir)): Remove sentry.
|
||||||
|
* testsuite/27_io/basic_istream/seekg/char/26211.cc: Remove.
|
||||||
|
* testsuite/27_io/basic_istream/seekg/wchar_t/26211.cc: Likewise.
|
||||||
|
* testsuite/27_io/basic_istream/tellg/char/26211.cc: Likewise.
|
||||||
|
* testsuite/27_io/basic_istream/tellg/wchar_t/26211.cc: Likewise.
|
||||||
|
* testsuite/27_io/basic_istream/seekg/char/8348-1.cc: Revert changes.
|
||||||
|
* testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc: Likewise.
|
||||||
|
* testsuite/27_io/basic_istream/seekg/char/8348-2.cc: Likewise.
|
||||||
|
* testsuite/27_io/basic_istream/seekg/wchar_t/8348-1.cc: Likewise.
|
||||||
|
* testsuite/27_io/basic_istream/tellg/char/8348.cc: Likewise.
|
||||||
|
* testsuite/27_io/basic_istream/tellg/wchar_t/8348.cc: Likewise.
|
||||||
|
|
||||||
2006-02-19 Paolo Carlini <pcarlini@suse.de>
|
2006-02-19 Paolo Carlini <pcarlini@suse.de>
|
||||||
|
|
||||||
* include/std/std_sstream.h (basic_stringbuf<>::setbuf): Simply
|
* include/std/std_sstream.h (basic_stringbuf<>::setbuf): Simply
|
||||||
|
|
|
@ -711,9 +711,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||||
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
||||||
// DR60. Do not change _M_gcount.
|
// DR60. Do not change _M_gcount.
|
||||||
pos_type __ret = pos_type(-1);
|
pos_type __ret = pos_type(-1);
|
||||||
sentry __cerb(*this, true);
|
|
||||||
if (__cerb)
|
|
||||||
{
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (!this->fail())
|
if (!this->fail())
|
||||||
|
@ -722,7 +719,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||||
}
|
}
|
||||||
catch(...)
|
catch(...)
|
||||||
{ this->_M_setstate(ios_base::badbit); }
|
{ this->_M_setstate(ios_base::badbit); }
|
||||||
}
|
|
||||||
return __ret;
|
return __ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -733,9 +729,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||||
{
|
{
|
||||||
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
||||||
// DR60. Do not change _M_gcount.
|
// DR60. Do not change _M_gcount.
|
||||||
sentry __cerb(*this, true);
|
|
||||||
if (__cerb)
|
|
||||||
{
|
|
||||||
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
|
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -754,7 +747,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||||
{ this->_M_setstate(ios_base::badbit); }
|
{ this->_M_setstate(ios_base::badbit); }
|
||||||
if (__err)
|
if (__err)
|
||||||
this->setstate(__err);
|
this->setstate(__err);
|
||||||
}
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -765,9 +757,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||||
{
|
{
|
||||||
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
||||||
// DR60. Do not change _M_gcount.
|
// DR60. Do not change _M_gcount.
|
||||||
sentry __cerb(*this, true);
|
|
||||||
if (__cerb)
|
|
||||||
{
|
|
||||||
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
|
ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -786,7 +775,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
|
||||||
{ this->_M_setstate(ios_base::badbit); }
|
{ this->_M_setstate(ios_base::badbit); }
|
||||||
if (__err)
|
if (__err)
|
||||||
this->setstate(__err);
|
this->setstate(__err);
|
||||||
}
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,64 +0,0 @@
|
||||||
// Copyright (C) 2006 Free Software Foundation
|
|
||||||
//
|
|
||||||
// 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 <istream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <testsuite_hooks.h>
|
|
||||||
|
|
||||||
// libstdc++/26211
|
|
||||||
void test01()
|
|
||||||
{
|
|
||||||
using namespace std;
|
|
||||||
bool test __attribute__((unused)) = true;
|
|
||||||
|
|
||||||
typedef istringstream::pos_type pos_type;
|
|
||||||
|
|
||||||
istringstream iss("Duos for Doris");
|
|
||||||
ostringstream oss;
|
|
||||||
|
|
||||||
const pos_type p0 = iss.tellg();
|
|
||||||
VERIFY( p0 == pos_type(0) );
|
|
||||||
|
|
||||||
iss >> oss.rdbuf();
|
|
||||||
VERIFY( iss.rdstate() == iss.eofbit );
|
|
||||||
|
|
||||||
iss.seekg(0, ios_base::beg);
|
|
||||||
VERIFY( iss.fail() );
|
|
||||||
|
|
||||||
iss.clear();
|
|
||||||
iss.seekg(0, ios_base::beg);
|
|
||||||
VERIFY( !iss.fail() );
|
|
||||||
VERIFY( iss.tellg() == p0 );
|
|
||||||
|
|
||||||
iss >> oss.rdbuf();
|
|
||||||
VERIFY( iss.rdstate() == iss.eofbit );
|
|
||||||
|
|
||||||
iss.seekg(p0);
|
|
||||||
VERIFY( iss.fail() );
|
|
||||||
|
|
||||||
iss.clear();
|
|
||||||
iss.seekg(p0);
|
|
||||||
VERIFY( !iss.fail() );
|
|
||||||
VERIFY( iss.tellg() == p0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
test01();
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -41,7 +41,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.seekg(pos1);
|
iss.seekg(pos1);
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.seekg(0, ios_base::beg);
|
iss.seekg(0, ios_base::beg);
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,64 +0,0 @@
|
||||||
// Copyright (C) 2006 Free Software Foundation
|
|
||||||
//
|
|
||||||
// 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 <istream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <testsuite_hooks.h>
|
|
||||||
|
|
||||||
// libstdc++/26211
|
|
||||||
void test01()
|
|
||||||
{
|
|
||||||
using namespace std;
|
|
||||||
bool test __attribute__((unused)) = true;
|
|
||||||
|
|
||||||
typedef wistringstream::pos_type pos_type;
|
|
||||||
|
|
||||||
wistringstream iss(L"Duos for Doris");
|
|
||||||
wostringstream oss;
|
|
||||||
|
|
||||||
const pos_type p0 = iss.tellg();
|
|
||||||
VERIFY( p0 == pos_type(0) );
|
|
||||||
|
|
||||||
iss >> oss.rdbuf();
|
|
||||||
VERIFY( iss.rdstate() == iss.eofbit );
|
|
||||||
|
|
||||||
iss.seekg(0, ios_base::beg);
|
|
||||||
VERIFY( iss.fail() );
|
|
||||||
|
|
||||||
iss.clear();
|
|
||||||
iss.seekg(0, ios_base::beg);
|
|
||||||
VERIFY( !iss.fail() );
|
|
||||||
VERIFY( iss.tellg() == p0 );
|
|
||||||
|
|
||||||
iss >> oss.rdbuf();
|
|
||||||
VERIFY( iss.rdstate() == iss.eofbit );
|
|
||||||
|
|
||||||
iss.seekg(p0);
|
|
||||||
VERIFY( iss.fail() );
|
|
||||||
|
|
||||||
iss.clear();
|
|
||||||
iss.seekg(p0);
|
|
||||||
VERIFY( !iss.fail() );
|
|
||||||
VERIFY( iss.tellg() == p0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
test01();
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -39,7 +39,6 @@ void test06(void)
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.seekg(pos1);
|
iss.seekg(pos1);
|
||||||
iss.clear();
|
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.seekg(0, ios_base::beg);
|
iss.seekg(0, ios_base::beg);
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
// Copyright (C) 2006 Free Software Foundation
|
|
||||||
//
|
|
||||||
// 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 <istream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <testsuite_hooks.h>
|
|
||||||
|
|
||||||
// libstdc++/26211
|
|
||||||
void test01()
|
|
||||||
{
|
|
||||||
using namespace std;
|
|
||||||
bool test __attribute__((unused)) = true;
|
|
||||||
|
|
||||||
typedef istringstream::pos_type pos_type;
|
|
||||||
|
|
||||||
istringstream iss("Duos for Doris");
|
|
||||||
ostringstream oss;
|
|
||||||
|
|
||||||
VERIFY( iss.tellg() == pos_type(0) );
|
|
||||||
|
|
||||||
iss >> oss.rdbuf();
|
|
||||||
VERIFY( iss.rdstate() == iss.eofbit );
|
|
||||||
VERIFY( iss.tellg() == pos_type(-1) );
|
|
||||||
|
|
||||||
iss.clear();
|
|
||||||
VERIFY( iss.tellg() == pos_type(14) );
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
test01();
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -41,7 +41,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.tellg();
|
iss.tellg();
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
@ -54,7 +53,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.seekg(0, ios_base::beg);
|
iss.seekg(0, ios_base::beg);
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
@ -67,7 +65,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.seekg(pos1);
|
iss.seekg(pos1);
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
// Copyright (C) 2006 Free Software Foundation
|
|
||||||
//
|
|
||||||
// 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 <istream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <testsuite_hooks.h>
|
|
||||||
|
|
||||||
// libstdc++/26211
|
|
||||||
void test01()
|
|
||||||
{
|
|
||||||
using namespace std;
|
|
||||||
bool test __attribute__((unused)) = true;
|
|
||||||
|
|
||||||
typedef wistringstream::pos_type pos_type;
|
|
||||||
|
|
||||||
wistringstream iss(L"Duos for Doris");
|
|
||||||
wostringstream oss;
|
|
||||||
|
|
||||||
VERIFY( iss.tellg() == pos_type(0) );
|
|
||||||
|
|
||||||
iss >> oss.rdbuf();
|
|
||||||
VERIFY( iss.rdstate() == iss.eofbit );
|
|
||||||
VERIFY( iss.tellg() == pos_type(-1) );
|
|
||||||
|
|
||||||
iss.clear();
|
|
||||||
VERIFY( iss.tellg() == pos_type(14) );
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
test01();
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -38,7 +38,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.tellg();
|
iss.tellg();
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
@ -51,7 +50,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.seekg(0, ios_base::beg);
|
iss.seekg(0, ios_base::beg);
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
@ -64,7 +62,6 @@ void test06(void)
|
||||||
iss >> asNum;
|
iss >> asNum;
|
||||||
VERIFY( test = iss.eof() );
|
VERIFY( test = iss.eof() );
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
iss.clear();
|
|
||||||
iss.seekg(pos1);
|
iss.seekg(pos1);
|
||||||
VERIFY( test = !iss.fail() );
|
VERIFY( test = !iss.fail() );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue