This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] Trivial clean up of some money_get tests


Hi,

tested x86-linux, committed to mainline.

Paolo.

///////////
2004-03-06  Paolo Carlini  <pcarlini@suse.de>

	* 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.
	
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/1.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/1.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc	2004-03-06 15:30:50.000000000 +0100
@@ -28,8 +28,6 @@
 void test01()
 {
   using namespace std;
-  typedef money_base::part part;
-  typedef money_base::pattern pattern;
   typedef istreambuf_iterator<char> iterator_type;
 
   bool test __attribute__((unused)) = true;
@@ -39,32 +37,18 @@
   locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
-  // cache the moneypunct facets
-  typedef moneypunct<char, true> __money_true;
-  typedef moneypunct<char, false> __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<char>& mon_get = use_facet<money_get<char> >(iss.getloc()); 
 
-
   iss.str("7.200.000.000,00 ");
   iterator_type is_it01(iss);
   string result1;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/2.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/2.cc	2004-02-16 17:46:25.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc	2004-03-06 15:32:30.000000000 +0100
@@ -28,8 +28,6 @@
 void test02()
 {
   using namespace std;
-  typedef money_base::part part;
-  typedef money_base::pattern pattern;
   typedef istreambuf_iterator<char> iterator_type;
 
   bool test __attribute__((unused)) = true;
@@ -39,22 +37,12 @@
   locale loc_hk = __gnu_test::try_named_locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
-  // cache the moneypunct facets
-  typedef moneypunct<char, true> __money_true;
-  typedef moneypunct<char, false> __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 -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/3.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/3.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc	2004-03-06 15:34:28.000000000 +0100
@@ -28,8 +28,6 @@
 void test03()
 {
   using namespace std;
-  typedef money_base::part part;
-  typedef money_base::pattern pattern;
   typedef istreambuf_iterator<char> iterator_type;
 
   bool test __attribute__((unused)) = true;
@@ -39,13 +37,6 @@
   locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
-  // cache the moneypunct facets
-  typedef moneypunct<char, true> __money_true;
-  typedef moneypunct<char, false> __money_false;
-
-  // sanity check the data is correct.
-  const string empty;
-
   // total EPA budget FY 2002
   const long double  digits1 = 720000000000.0;
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/4.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/4.cc	2004-02-16 17:46:25.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc	2004-03-06 15:35:34.000000000 +0100
@@ -37,13 +37,6 @@
   locale loc_hk = __gnu_test::try_named_locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
-  // cache the moneypunct facets
-  typedef moneypunct<char, true> __money_true;
-  typedef moneypunct<char, false> __money_false;
-
-  // sanity check the data is correct.
-  const string empty;
-
   // input less than frac_digits
   const long double digits4 = -1.0;
   
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/1.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/1.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc	2004-03-06 15:31:29.000000000 +0100
@@ -28,8 +28,6 @@
 void test01()
 {
   using namespace std;
-  typedef money_base::part part;
-  typedef money_base::pattern pattern;
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
   bool test __attribute__((unused)) = true;
@@ -39,32 +37,18 @@
   locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
-  // cache the moneypunct facets
-  typedef moneypunct<wchar_t, true> __money_true;
-  typedef moneypunct<wchar_t, false> __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<wchar_t>& mon_get = use_facet<money_get<wchar_t> >(iss.getloc()); 
 
-
   iss.str(L"7.200.000.000,00 ");
   iterator_type is_it01(iss);
   wstring result1;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/2.cc	2004-02-16 17:46:26.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc	2004-03-06 15:33:12.000000000 +0100
@@ -28,8 +28,6 @@
 void test02()
 {
   using namespace std;
-  typedef money_base::part part;
-  typedef money_base::pattern pattern;
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
   bool test __attribute__((unused)) = true;
@@ -39,22 +37,12 @@
   locale loc_hk = __gnu_test::try_named_locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
-  // cache the moneypunct facets
-  typedef moneypunct<wchar_t, true> __money_true;
-  typedef moneypunct<wchar_t, false> __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 -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/3.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc	2004-03-06 15:33:46.000000000 +0100
@@ -28,8 +28,6 @@
 void test03()
 {
   using namespace std;
-  typedef money_base::part part;
-  typedef money_base::pattern pattern;
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
   bool test __attribute__((unused)) = true;
@@ -39,13 +37,6 @@
   locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
-  // cache the moneypunct facets
-  typedef moneypunct<wchar_t, true> __money_true;
-  typedef moneypunct<wchar_t, false> __money_false;
-
-  // sanity check the data is correct.
-  const wstring empty;
-
   // total EPA budget FY 2002
   const long double  digits1 = 720000000000.0;
   
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/4.cc	2004-02-16 17:46:26.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc	2004-03-06 15:35:00.000000000 +0100
@@ -37,13 +37,6 @@
   locale loc_hk = __gnu_test::try_named_locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
-  // cache the moneypunct facets
-  typedef moneypunct<wchar_t, true> __money_true;
-  typedef moneypunct<wchar_t, false> __money_false;
-
-  // sanity check the data is correct.
-  const wstring empty;
-
   // input less than frac_digits
   const long double digits4 = -1.0;
   

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]