aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2008-11-21 10:14:14 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2008-11-21 10:14:14 +0000
commit6b96ae3a28f6dff08a946ae48b8c33aae529fee3 (patch)
tree59152a9456d212819639d6ed051b5ff57ae32862
parentd2f6b13b3b92c311d5a2c3f3f759d87a0db07f88 (diff)
downloadgcc-6b96ae3a28f6dff08a946ae48b8c33aae529fee3.zip
gcc-6b96ae3a28f6dff08a946ae48b8c33aae529fee3.tar.gz
gcc-6b96ae3a28f6dff08a946ae48b8c33aae529fee3.tar.bz2
38210.cc: Tweak.
2008-11-21 Paolo Carlini <paolo.carlini@oracle.com> * testsuite/22_locale/num_put/put/char/38210.cc: Tweak. * testsuite/22_locale/num_put/put/wchar_t/38210.cc: Likewise. From-SVN: r142086
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/22_locale/num_put/put/char/38210.cc4
-rw-r--r--libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38210.cc4
3 files changed, 5 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b3a6d11..c2ebda5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2008-11-21 Paolo Carlini <paolo.carlini@oracle.com>
+ * testsuite/22_locale/num_put/put/char/38210.cc: Tweak.
+ * testsuite/22_locale/num_put/put/wchar_t/38210.cc: Likewise.
+
+2008-11-21 Paolo Carlini <paolo.carlini@oracle.com>
+
PR libstdc++/38210
* include/bits/locale_facets.tcc (num_put<>::do_put(iter_type,
ios_base&, char_type, const void*)): Fix.
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/38210.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/38210.cc
index 4f43da2..5d4aea9 100644
--- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/38210.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/38210.cc
@@ -39,28 +39,24 @@ void test01()
void* p = (void*)0x1;
oss1.width(5);
- oss1.setf(ios_base::boolalpha);
ng1.put(oss1.rdbuf(), oss1, '*', p);
result1 = oss1.str();
VERIFY( result1 == "**0x1" );
oss2.width(5);
oss2.setf(ios_base::right, ios_base::adjustfield);
- oss2.setf(ios_base::boolalpha);
ng2.put(oss2.rdbuf(), oss2, '*', p);
result2 = oss2.str();
VERIFY( result2 == "**0x1" );
oss3.width(5);
oss3.setf(ios_base::internal, ios_base::adjustfield);
- oss3.setf(ios_base::boolalpha);
ng3.put(oss3.rdbuf(), oss3, '*', p);
result3 = oss3.str();
VERIFY( result3 == "0x**1" );
oss4.width(5);
oss4.setf(ios_base::left, ios_base::adjustfield);
- oss4.setf(ios_base::boolalpha);
ng4.put(oss4.rdbuf(), oss4, '*', p);
result4 = oss4.str();
VERIFY( result4 == "0x1**" );
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38210.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38210.cc
index 175c51c..a576249 100644
--- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38210.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/38210.cc
@@ -39,28 +39,24 @@ void test01()
void* p = (void*)0x1;
oss1.width(5);
- oss1.setf(ios_base::boolalpha);
ng1.put(oss1.rdbuf(), oss1, L'*', p);
result1 = oss1.str();
VERIFY( result1 == L"**0x1" );
oss2.width(5);
oss2.setf(ios_base::right, ios_base::adjustfield);
- oss2.setf(ios_base::boolalpha);
ng2.put(oss2.rdbuf(), oss2, L'*', p);
result2 = oss2.str();
VERIFY( result2 == L"**0x1" );
oss3.width(5);
oss3.setf(ios_base::internal, ios_base::adjustfield);
- oss3.setf(ios_base::boolalpha);
ng3.put(oss3.rdbuf(), oss3, L'*', p);
result3 = oss3.str();
VERIFY( result3 == L"0x**1" );
oss4.width(5);
oss4.setf(ios_base::left, ios_base::adjustfield);
- oss4.setf(ios_base::boolalpha);
ng4.put(oss4.rdbuf(), oss4, L'*', p);
result4 = oss4.str();
VERIFY( result4 == L"0x1**" );