std_complex.h (operator<<(basic_ostream&, const complex&)): Prefer 'x' to "x" for...

2002-11-25  Wolfgang Bangerth  <bangerth@ticam.utexas.edu>

	* include/std/std_complex.h
	(operator<<(basic_ostream&, const complex&)): Prefer 'x'
	to "x" for efficiency sake.
	* src/locale.cc (locale::locale(const char*)): Ditto.

From-SVN: r59465

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d84114e55ab52250dfd9aad7e76aa5dff481c9aa..f060b28be54f0e20b52a15f4746a2681a36a5baa 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-25  Wolfgang Bangerth  <bangerth@ticam.utexas.edu>
+
+       * include/std/std_complex.h
+       (operator<<(basic_ostream&, const complex&)): Prefer 'x'
+       to "x" for efficiency sake.
+       * src/locale.cc (locale::locale(const char*)): Ditto.
+
 2002-11-24  Paolo Carlini  <pcarlini@unitus.it>
 
        * src/locale.cc (locale::locale(const char*)):

diff --git a/libstdc++-v3/include/std/std_complex.h b/libstdc++-v3/include/std/std_complex.h
index bcfcedde8e9a7c4833237ec14a420e0602accceb..f297296386b43cfac521e157aecbd0efc6a98845 100644 (file)
--- a/libstdc++-v3/include/std/std_complex.h
+++ b/libstdc++-v3/include/std/std_complex.h
@@ -390,7 +390,7 @@ namespace std
       __s.flags(__os.flags());
       __s.imbue(__os.getloc());
       __s.precision(__os.precision());
-      __s << '(' << __x.real() << "," << __x.imag() << ')';
+      __s << '(' << __x.real() << ',' << __x.imag() << ')';
       return __os << __s.str();
     }
 

diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index dfb2feba8eb0c2bb2037838caafece90698c4884..c5c6dd8a049c60d5f5a5bb4072be20b74ffa7c16 100644 (file)
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -235,14 +235,14 @@ namespace std
                    for (size_t __j = 0; __j < __i; ++__j)
                      {
                        __str += _S_categories[__j];
-                       __str += "=";
+                       __str += '=';
                        __str += __res;
-                       __str += ";";
+                       __str += ';';
                      }
                    __str += _S_categories[__i];
-                   __str += "=";
+                   __str += '=';
                    __str += __env;
-                   __str += ";";
+                   __str += ';';
                    __i++;
                    for (; __i < _S_categories_size
                           + _S_extra_categories_size; ++__i)
@@ -251,9 +251,9 @@ namespace std
                        if (!__env || strcmp(__env, "") == 0)
                          {
                            __str += _S_categories[__i];
-                           __str += "=";
+                           __str += '=';
                            __str += __res;
-                           __str += ";";
+                           __str += ';';
                          }
                        else if (strcmp(__env, "C") == 0
                                 || strcmp(__env, "POSIX") == 0)
@@ -264,9 +264,9 @@ namespace std
                        else
                          {
                            __str += _S_categories[__i];
-                           __str += "=";
+                           __str += '=';
                            __str += __env;
-                           __str += ";";
+                           __str += ';';
                          }
                      }
                    __str.erase(__str.end() - 1);
@@ -347,15 +347,15 @@ namespace std
     else
       {
        __ret += _S_categories[0];
-       __ret += "=";
+       __ret += '=';
        __ret += _M_impl->_M_names[0]; 
        for (size_t __i = 1; 
             __i < _S_categories_size + _S_extra_categories_size; 
             ++__i)
          {
-           __ret += ";";
+           __ret += ';';
            __ret += _S_categories[__i];
-           __ret += "=";
+           __ret += '=';
            __ret += _M_impl->_M_names[__i];
          }
       }