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

re PR libstdc++/9169 (filebuf output fails if codecvt<>::out returns noconv)

Browse Source 
2003-02-17  Paolo Carlini  <pcarlini@unitus.it>

	PR libstdc++/9169
	* include/bits/fstream.tcc (_M_convert_to_external):
	Deal correctly with noconv, as prescribed by 27.8.1.4,p8.
	* testsuite/27_io/filebuf_virtuals.cc (test10): Add.

From-SVN: r63004
This commit is contained in:
Paolo Carlini 2003-02-17 20:05:01 +01:00 committed by Paolo Carlini
parent ba5d2d3dc1
commit 130cd3e1df
3 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2003-02-17 Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/9169
* include/bits/fstream.tcc (_M_convert_to_external):
Deal correctly with noconv, as prescribed by 27.8.1.4,p8.
* testsuite/27_io/filebuf_virtuals.cc (test10): Add.
2003-02-13 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/c++config (_GLIBCPP_EXTERN_TEMPLATE): Define.

10
libstdc++-v3/include/bits/fstream.tcc
View File

@ -291,9 +291,15 @@ namespace std
const char_type* __iend;
__res_type __r = __cvt.out(_M_state_cur, __ibuf, __ibuf + __ilen,
__iend, __buf, __buf + __blen, __bend);
// Result == ok, partial, noconv
if (__r != codecvt_base::error)
if (__r == codecvt_base::ok || __r == codecvt_base::partial)
__blen = __bend - __buf;
// Similarly to the always_noconv case above.
else if (__r == codecvt_base::noconv)
{
__buf = reinterpret_cast<char*>(__ibuf);
__blen = __ilen;
}
// Result == error
else
__blen = 0;

41
libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc
View File

@ -584,6 +584,46 @@ void test09()
VERIFY( r == filebuf::traits_type::eof() );
}
class Cvt_to_upper : public std::codecvt<char, char, mbstate_t>
{
bool do_always_noconv() const throw()
{
return false;
}
};
// libstdc++/9169
void test10()
{
using namespace std;
bool test = true;
locale c_loc;
locale loc(c_loc, new Cvt_to_upper);
string str("abcdefghijklmnopqrstuvwxyz");
string tmp;
{
ofstream out;
out.imbue(loc);
out.open("filebuf_virtuals-4.txt");
copy(str.begin(), str.end(),
ostreambuf_iterator<char>(out));
}
{
ifstream in;
in.open("filebuf_virtuals-4.txt");
copy(istreambuf_iterator<char>(in),
istreambuf_iterator<char>(),
back_inserter(tmp));
}
VERIFY( tmp.size() == str.size() );
VERIFY( tmp == str );
}
main()
{
test01();
@ -597,5 +637,6 @@ main()
test07();
test08();
test09();
test10();
return 0;
}