stof.cc: Improve check on long double limits.

2008-07-03  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc:
	Improve check on long double limits.
	* testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc:
	Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stof.cc: Likewise.
	* testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
	stod.cc: Likewise.

From-SVN: r137428

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6459c758156921f642cb9e241d3224351fc74f51..a937a52aa92cfda0e406076c94485d4b6ce2518c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc:
+       Improve check on long double limits.
+       * testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc:
+       Likewise.
+       * testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
+       stof.cc: Likewise.
+       * testsuite/21_strings/basic_string/numeric_conversions/wchar_t/
+       stod.cc: Likewise.
+
 2008-07-03  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * libsupc++/Makefile.am: Add initializer_list to the headers.

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc
index f26a865684d2fcab8a9861f4d07736b6e03f99e7..765c5a210ec5035738ce315d568faa93b4b0412a 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc
@@ -107,7 +107,8 @@ test01()
     }
   VERIFY( test );
 
-  if (sizeof(double) < sizeof(long double))
+  if ((numeric_limits<long double>::max() / 10000.0L)
+      > numeric_limits<double>::max())
     {
       test = false;
       d1 = -1.0;

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc
index 515769e18f76f6d2429cb75f7ed06f68e614b5fe..5645c0af9b8fd4eb647cbd3061915db1e88277f7 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc
@@ -107,7 +107,8 @@ test01()
     }
   VERIFY( test );
 
-  if (sizeof(float) < sizeof(long double))
+  if ((numeric_limits<long double>::max() / 10000.0L)
+      > numeric_limits<float>::max())
     {
       test = false;
       f1 = -1.0f;

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
index c1ebbb228d9b133d865ac04494fec713b8f7a811..e494f4282baf480e5ca41c120da0d9da83c66879 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stod.cc
@@ -107,7 +107,8 @@ test01()
     }
   VERIFY( test );
 
-  if (sizeof(double) < sizeof(long double))
+  if ((numeric_limits<long double>::max() / 10000.0L)
+      > numeric_limits<double>::max())
     {
       test = false;
       d1 = -1.0;

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc
index 6f443c8bf9731d119632376288025057915fce93..a6319f8e31e52376e079566cdab85a34cdf90e0b 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/wchar_t/stof.cc
@@ -107,7 +107,8 @@ test01()
     }
   VERIFY( test );
 
-  if (sizeof(float) < sizeof(long double))
+  if ((numeric_limits<long double>::max() / 10000.0L)
+      > numeric_limits<float>::max())
     {
       test = false;
       f1 = -1.0f;