OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

std_fstream.h (basic_fstream<>::open, [...]): Implement the resolution of DR 409 [Ready], call clear() on success.

Browse Source 
2005-03-07  Paolo Carlini  <pcarlini@suse.de>

	* include/std/std_fstream.h (basic_fstream<>::open,
	basic_ifstream<>::open, basic_ofstream<>::open): Implement the
	resolution of DR 409 [Ready], call clear() on success.
	* docs/html/ext/howto.html: Add an entry for DR 409.
	* docs/html/faq/index.html (4_4): Clarify the new behavior.
	* testsuite/27_io/basic_ifstream/open/char/1.cc: Adjust.
	* testsuite/27_io/basic_ofstream/open/char/1.cc: Likewise.

From-SVN: r96030
This commit is contained in:
Paolo Carlini 2005-03-07 16:58:43 +00:00 committed by Paolo Carlini
parent 9ed9eda673
commit 7a59efae86
6 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2005-03-07 Paolo Carlini <pcarlini@suse.de>
* include/std/std_fstream.h (basic_fstream<>::open,
basic_ifstream<>::open, basic_ofstream<>::open): Implement the
resolution of DR 409 [Ready], call clear() on success.
* docs/html/ext/howto.html: Add an entry for DR 409.
* docs/html/faq/index.html (4_4): Clarify the new behavior.
* testsuite/27_io/basic_ifstream/open/char/1.cc: Adjust.
* testsuite/27_io/basic_ofstream/open/char/1.cc: Likewise.
2005-03-05 Joseph S. Myers <joseph@codesourcery.com>
* testsuite/22_locale/collate/compare/wchar_t/2.cc,

6
libstdc++-v3/docs/html/ext/howto.html
View File

@ -503,6 +503,12 @@
<dd>Replace &quot;new&quot; with &quot;::new&quot;.
</dd>
<dt><a href="lwg-active.html#409">409</a>:
<em>Closing an fstream should clear the error state</em>
</dt>
<dd>Have <code>open</code> clear the error flags.
</dd>
<dt><a href="lwg-active.html#434">434</a>:
<em>bitset::to_string() hard to use</em>
</dt>

3
libstdc++-v3/docs/html/faq/index.html
View File

@ -721,6 +721,9 @@ which is no longer available, thanks deja...-->
DR #22</a> is to leave the flags unchanged. You must insert a call
to <code>fs.clear()</code> between the calls to close() and open(),
and then everything will work like we all expect it to work.
<strong>Update:</strong> for GCC 4.0 we implemented the resolution
of <a href="../ext/howto.html#5">DR #409</a> and open() now calls
<code>clear()</code> on success!
</p>
<p><a name="4_4_rel_ops"><strong>rel_ops</strong></a>
Another is the <code>rel_ops</code> namespace and the template

12
libstdc++-v3/include/std/std_fstream.h
View File

@ -496,6 +496,10 @@ namespace std
{
if (!_M_filebuf.open(__s, __mode | ios_base::in))
this->setstate(ios_base::failbit);
else
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 409. Closing an fstream should clear error state
this->clear();
}
/**
@ -623,6 +627,10 @@ namespace std
{
if (!_M_filebuf.open(__s, __mode | ios_base::out))
this->setstate(ios_base::failbit);
else
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 409. Closing an fstream should clear error state
this->clear();
}
/**
@ -749,6 +757,10 @@ namespace std
{
if (!_M_filebuf.open(__s, __mode))
this->setstate(ios_base::failbit);
else
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 409. Closing an fstream should clear error state
this->clear();
}
/**

9
libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
// Copyright (C) 2000, 2001, 2003, 2005 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
@ -40,9 +40,10 @@ void test01()
ifs1.open(name_01);
VERIFY( ifs1.is_open() );
// fail bit still true
VERIFY( !(ifs1) );
VERIFY( ifs1.rdstate() == std::ios_base::failbit );
// As per the resolution of DR 409.
VERIFY( (ifs1) );
VERIFY( ifs1.rdstate() == std::ios_base::goodbit );
ifs1.close();
}

9
libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc
View File

@ -1,4 +1,4 @@
// Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
// Copyright (C) 2000, 2001, 2003, 2005 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
@ -41,9 +41,10 @@ void test01()
ofs1.open(name_02);
VERIFY( ofs1.is_open() );
// fail bit still true
VERIFY( !(ofs1) );
VERIFY( ofs1.rdstate() == std::ios_base::failbit );
// As per the resolution of DR 409.
VERIFY( (ofs1) );
VERIFY( ofs1.rdstate() == std::ios_base::goodbit );
ofs1.close();
}