Skip to content

R
riscv-gcc-1
Commit f883c8dc by Paolo Carlini
Options

1.cc: Clean up. 

2003-10-26  Paolo Carlini  <pcarlini@suse.de>

	* testsuite/22_locale/money_put/put/char/1.cc: Clean up.
	* testsuite/22_locale/money_put/put/wchar_t/1.cc: Ditto.

From-SVN: r72949
parent 38f9cd4c
Showing with 40 additions and 57 deletions
libstdc++-v3/ChangeLog
2003-10-26 Paolo Carlini <pcarlini@suse.de>
* testsuite/22_locale/money_put/put/char/1.cc: Clean up.
* testsuite/22_locale/money_put/put/wchar_t/1.cc: Ditto.
2003-10-25 Paolo Carlini <pcarlini@suse.de> 2003-10-25 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (num_get::_M_extract_int): * include/bits/locale_facets.tcc (num_get::_M_extract_int):
...@@ -289,35 +294,35 @@ ...@@ -289,35 +294,35 @@
* testsuite/27_io/types/3.cc: New test. * testsuite/27_io/types/3.cc: New test.
2003-10-16 Benjamin Kosnik <bkoz@redhat.com> 2003-10-16 Benjamin Kosnik <bkoz@redhat.com>
* configure.host: Remove fpos_include_dir. * configure.host: Remove fpos_include_dir.
* configure.ac: Remove FPOS_INC_SRCDIR. * configure.ac: Remove FPOS_INC_SRCDIR.
* configure: Regenerate. * configure: Regenerate.
* acinclude.m4 (GLIBCXX_ENABLE_CSTDIO): Remove FPOS_H. * acinclude.m4 (GLIBCXX_ENABLE_CSTDIO): Remove FPOS_H.
* aclocal.m4: Regenerate. * aclocal.m4: Regenerate.
* include/Makefile.am (host_headers): Remove fpos.h. * include/Makefile.am (host_headers): Remove fpos.h.
(bits_headers): Add postypes.h. (bits_headers): Add postypes.h.
* include/Makefile.in: Regenerate. * include/Makefile.in: Regenerate.
* config/os/gnu-linux/fposh: Remove. * config/os/gnu-linux/fposh: Remove.
* config/os/generic/fpos.h: Remove. * config/os/generic/fpos.h: Remove.
* testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc: Fixup. * testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc: Fixup.
* testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc: Same. * testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc: Same. * testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc: Same.
* testsuite/27_io/basic_istream/seekg/char/2.cc: Same. * testsuite/27_io/basic_istream/seekg/char/2.cc: Same.
* testsuite/27_io/basic_stringbuf/seekoff/char/1.cc: Same. * testsuite/27_io/basic_stringbuf/seekoff/char/1.cc: Same.
* testsuite/27_io/basic_stringbuf/seekpos/char/1.cc: Same. * testsuite/27_io/basic_stringbuf/seekpos/char/1.cc: Same.
* testsuite/27_io/fpos/mbstate_t/3.cc: Same. * testsuite/27_io/fpos/mbstate_t/3.cc: Same.
* testsuite/27_io/objects/char/10.cc: Same. * testsuite/27_io/objects/char/10.cc: Same.
2003-10-16 Paolo Carlini <pcarlini@suse.de> 2003-10-16 Paolo Carlini <pcarlini@suse.de>
......
libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc
...@@ -36,13 +36,8 @@ void test01() ...@@ -36,13 +36,8 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk = __gnu_test::try_named_locale("en_HK");
locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro");
locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de );
VERIFY( loc_de != loc_fr );
// cache the moneypunct facets // cache the moneypunct facets
typedef moneypunct<char, true> __money_true; typedef moneypunct<char, true> __money_true;
...@@ -54,14 +49,8 @@ void test01() ...@@ -54,14 +49,8 @@ void test01()
// total EPA budget FY 2002 // total EPA budget FY 2002
const string digits1("720000000000"); const string digits1("720000000000");
// est. cost, national missile "defense", expressed as a loss in USD 2001
const string digits2("-10000000000000");
// not valid input
const string digits3("-A");
// input less than frac_digits // input less than frac_digits
const string digits4("-1"); const string digits2("-1");
// cache the money_put facet // cache the money_put facet
ostringstream oss; ostringstream oss;
...@@ -104,14 +93,14 @@ void test01() ...@@ -104,14 +93,14 @@ void test01()
// test various fill strategies // test various fill strategies
oss.str(empty); oss.str(empty);
oss.width(20); oss.width(20);
iterator_type os_it10 = mon_put.put(oss.rdbuf(), true, oss, '*', digits4); iterator_type os_it10 = mon_put.put(oss.rdbuf(), true, oss, '*', digits2);
string result10 = oss.str(); string result10 = oss.str();
VERIFY( result10 == "***************-,01*"); VERIFY( result10 == "***************-,01*");
oss.str(empty); oss.str(empty);
oss.width(20); oss.width(20);
oss.setf(ios_base::internal); oss.setf(ios_base::internal);
iterator_type os_it11 = mon_put.put(oss.rdbuf(), true, oss, '*', digits4); iterator_type os_it11 = mon_put.put(oss.rdbuf(), true, oss, '*', digits2);
string result11 = oss.str(); string result11 = oss.str();
VERIFY( result11 == "-,01****************"); VERIFY( result11 == "-,01****************");
} }
......
libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc
...@@ -36,13 +36,8 @@ void test01() ...@@ -36,13 +36,8 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk = __gnu_test::try_named_locale("en_HK");
locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro");
locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de );
VERIFY( loc_de != loc_fr );
// cache the moneypunct facets // cache the moneypunct facets
typedef moneypunct<wchar_t, true> __money_true; typedef moneypunct<wchar_t, true> __money_true;
...@@ -54,14 +49,8 @@ void test01() ...@@ -54,14 +49,8 @@ void test01()
// total EPA budget FY 2002 // total EPA budget FY 2002
const wstring digits1(L"720000000000"); const wstring digits1(L"720000000000");
// est. cost, national missile "defense", expressed as a loss in USD 2001
const wstring digits2(L"-10000000000000");
// not valid input
const wstring digits3(L"-A");
// input less than frac_digits // input less than frac_digits
const wstring digits4(L"-1"); const wstring digits2(L"-1");
// cache the money_put facet // cache the money_put facet
wostringstream oss; wostringstream oss;
...@@ -104,14 +93,14 @@ void test01() ...@@ -104,14 +93,14 @@ void test01()
// test various fill strategies // test various fill strategies
oss.str(empty); oss.str(empty);
oss.width(20); oss.width(20);
iterator_type os_it10 = mon_put.put(oss.rdbuf(), true, oss, '*', digits4); iterator_type os_it10 = mon_put.put(oss.rdbuf(), true, oss, '*', digits2);
wstring result10 = oss.str(); wstring result10 = oss.str();
VERIFY( result10 == L"***************-,01*"); VERIFY( result10 == L"***************-,01*");
oss.str(empty); oss.str(empty);
oss.width(20); oss.width(20);
oss.setf(ios_base::internal); oss.setf(ios_base::internal);
iterator_type os_it11 = mon_put.put(oss.rdbuf(), true, oss, '*', digits4); iterator_type os_it11 = mon_put.put(oss.rdbuf(), true, oss, '*', digits2);
wstring result11 = oss.str(); wstring result11 = oss.str();
VERIFY( result11 == L"-,01****************"); VERIFY( result11 == L"-,01****************");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment