From 73da19bbb6479ee1540b5f306aa0b8c824242950 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 6 Mar 2004 14:56:56 +0000 Subject: [PATCH] 1.cc: Clean up. 2004-03-06 Paolo Carlini * testsuite/22_locale/money_get/get/char/1.cc: Clean up. * testsuite/22_locale/money_get/get/char/2.cc: Likewise. * testsuite/22_locale/money_get/get/char/3.cc: Likewise. * testsuite/22_locale/money_get/get/char/4.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/1.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/2.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/3.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/4.cc: Likewise. From-SVN: r79019 --- libstdc++-v3/ChangeLog | 11 +++++++++++ .../testsuite/22_locale/money_get/get/char/1.cc | 16 ---------------- .../testsuite/22_locale/money_get/get/char/2.cc | 12 ------------ .../testsuite/22_locale/money_get/get/char/3.cc | 9 --------- .../testsuite/22_locale/money_get/get/char/4.cc | 7 ------- .../22_locale/money_get/get/wchar_t/1.cc | 16 ---------------- .../22_locale/money_get/get/wchar_t/2.cc | 12 ------------ .../22_locale/money_get/get/wchar_t/3.cc | 9 --------- .../22_locale/money_get/get/wchar_t/4.cc | 7 ------- 9 files changed, 11 insertions(+), 88 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ef11a7ff21b5..94d0e902b3e9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2004-03-06 Paolo Carlini + + * testsuite/22_locale/money_get/get/char/1.cc: Clean up. + * testsuite/22_locale/money_get/get/char/2.cc: Likewise. + * testsuite/22_locale/money_get/get/char/3.cc: Likewise. + * testsuite/22_locale/money_get/get/char/4.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/1.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/2.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/3.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/4.cc: Likewise. + 2004-03-06 Paolo Carlini * include/bits/locale_facets.tcc (num_get<>::_M_extract_float, diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc index b63d384f7392..08e47d858156 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc @@ -28,8 +28,6 @@ void test01() { using namespace std; - typedef money_base::part part; - typedef money_base::pattern pattern; typedef istreambuf_iterator iterator_type; bool test __attribute__((unused)) = true; @@ -39,32 +37,18 @@ void test01() locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - // sanity check the data is correct. const string empty; // total EPA budget FY 2002 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 - const string digits4("-1"); - iterator_type end; istringstream iss; iss.imbue(loc_de); // cache the money_get facet const money_get& mon_get = use_facet >(iss.getloc()); - iss.str("7.200.000.000,00 "); iterator_type is_it01(iss); string result1; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc index b9bd0052cb63..e6ae8d926bb7 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc @@ -28,8 +28,6 @@ void test02() { using namespace std; - typedef money_base::part part; - typedef money_base::pattern pattern; typedef istreambuf_iterator iterator_type; bool test __attribute__((unused)) = true; @@ -39,22 +37,12 @@ void test02() locale loc_hk = __gnu_test::try_named_locale("en_HK"); VERIFY( loc_c != loc_hk ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - - // sanity check the data is correct. - const string empty; - // total EPA budget FY 2002 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 const string digits4("-1"); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc index a717bd9a0264..6a07ab251666 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc @@ -28,8 +28,6 @@ void test03() { using namespace std; - typedef money_base::part part; - typedef money_base::pattern pattern; typedef istreambuf_iterator iterator_type; bool test __attribute__((unused)) = true; @@ -39,13 +37,6 @@ void test03() locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - - // sanity check the data is correct. - const string empty; - // total EPA budget FY 2002 const long double digits1 = 720000000000.0; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc index c5aa7a3a8c49..9556dfbf0035 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc @@ -37,13 +37,6 @@ void test04() locale loc_hk = __gnu_test::try_named_locale("en_HK"); VERIFY( loc_c != loc_hk ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - - // sanity check the data is correct. - const string empty; - // input less than frac_digits const long double digits4 = -1.0; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc index 8a93e66aa66e..f382e484faa9 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc @@ -28,8 +28,6 @@ void test01() { using namespace std; - typedef money_base::part part; - typedef money_base::pattern pattern; typedef istreambuf_iterator iterator_type; bool test __attribute__((unused)) = true; @@ -39,32 +37,18 @@ void test01() locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - // sanity check the data is correct. const wstring empty; // total EPA budget FY 2002 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 - const wstring digits4(L"-1"); - iterator_type end; wistringstream iss; iss.imbue(loc_de); // cache the money_get facet const money_get& mon_get = use_facet >(iss.getloc()); - iss.str(L"7.200.000.000,00 "); iterator_type is_it01(iss); wstring result1; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc index 95a0c735632b..bf7edc11b630 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc @@ -28,8 +28,6 @@ void test02() { using namespace std; - typedef money_base::part part; - typedef money_base::pattern pattern; typedef istreambuf_iterator iterator_type; bool test __attribute__((unused)) = true; @@ -39,22 +37,12 @@ void test02() locale loc_hk = __gnu_test::try_named_locale("en_HK"); VERIFY( loc_c != loc_hk ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - - // sanity check the data is correct. - const wstring empty; - // total EPA budget FY 2002 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 const wstring digits4(L"-1"); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc index 90c45e8c1a98..2b1dc33e2bea 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc @@ -28,8 +28,6 @@ void test03() { using namespace std; - typedef money_base::part part; - typedef money_base::pattern pattern; typedef istreambuf_iterator iterator_type; bool test __attribute__((unused)) = true; @@ -39,13 +37,6 @@ void test03() locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - - // sanity check the data is correct. - const wstring empty; - // total EPA budget FY 2002 const long double digits1 = 720000000000.0; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc index cb1a2abfcbcb..4f541ed882ad 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc @@ -37,13 +37,6 @@ void test04() locale loc_hk = __gnu_test::try_named_locale("en_HK"); VERIFY( loc_c != loc_hk ); - // cache the moneypunct facets - typedef moneypunct __money_true; - typedef moneypunct __money_false; - - // sanity check the data is correct. - const wstring empty; - // input less than frac_digits const long double digits4 = -1.0; -- 2.39.5