From 4f70f9d237bd16869e6f6146b3709cbefa3dffe9 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Mon, 29 Nov 2004 13:29:54 +0000
Subject: [PATCH] 18654.cc: Use better names.

2004-11-29  Paolo Carlini  <pcarlini@suse.de>

        * testsuite/21_strings/basic_string/capacity/char/18654.cc: Use
	better names.
        * testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc: Same.

From-SVN: r91469
---
 libstdc++-v3/ChangeLog                                    | 6 ++++++
 .../21_strings/basic_string/capacity/char/18654.cc        | 8 ++++----
 .../21_strings/basic_string/capacity/wchar_t/18654.cc     | 6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b0d82f84ab6..95eae138627 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-29  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/21_strings/basic_string/capacity/char/18654.cc: Use
+        better names.
+	* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc: Same.
+
 2004-11-29  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/18654
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
index 16dd7ea9ebe..5194d818be3 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
@@ -34,9 +34,9 @@ void test01()
   // Our current implementation provides exact shrink-to-size
   // and shrink-to-fit (in the future, maybe this will change
   // for short strings).
-  size_type min = 2 << 0;
-  size_type max = 2 << 20;
-  for (size_type i = min; i <= max; i *= 2)
+  const size_type minsize = 2 << 0;
+  const size_type maxsize = 2 << 20;
+  for (size_type i = minsize; i <= maxsize; i *= 2)
     {
       string str(i, 'x');
       str.reserve(3 * i);
@@ -49,7 +49,7 @@ void test01()
     }
 }
 
-int main() 
+int main()
 {
   test01();
   return 0;
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
index 1b683bb4ada..38623ebdebf 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
@@ -34,9 +34,9 @@ void test01()
   // Our current implementation provides exact shrink-to-size
   // and shrink-to-fit (in the future, maybe this will change
   // for short strings).
-  size_type min = 2 << 0;
-  size_type max = 2 << 20;
-  for (size_type i = min; i <= max; i *= 2)
+  const size_type minsize = 2 << 0;
+  const size_type maxsize = 2 << 20;
+  for (size_type i = minsize; i <= maxsize; i *= 2)
     {
       wstring str(i, L'x');
       str.reserve(3 * i);