locale.cc (locale::locale(const char*)): Tweak a couple of comparisons to use basic_s...

2003-10-16  Paolo Carlini  <pcarlini@suse.de>

	* src/locale.cc (locale::locale(const char*)): Tweak
	a couple of comparisons to use basic_string operators.

From-SVN: r72554

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c53f88538f6d0efff652f4d87081f13bef63101c..7b0f83f0304a798a6c7c7006ee3d3cc87e418247 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-16  Paolo Carlini  <pcarlini@suse.de>
+
+       * src/locale.cc (locale::locale(const char*)): Tweak
+       a couple of comparisons to use basic_string operators.
+
 2003-10-16  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/12540

diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index 12f77e1997e444c0ff48c0ddccc60188cab1d1c9..c6525405211ebeefcc594d11338bc59158d7cbb8 100644 (file)
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -221,21 +221,21 @@ namespace std
                // Scan the categories looking for the first one
                // different from LANG.
                size_t __i = 0;
-               if (std::strcmp(__res.c_str(), "C") == 0)
+               if (__res == "C")
                  for (; __i < _S_categories_size; ++__i)
                    {
                      __env = std::getenv(_S_categories[__i]);
                      if (__env && std::strcmp(__env, "") != 0 
                          && std::strcmp(__env, "C") != 0 
-                         && std::strcmp(__env, "POSIX") != 0) 
+                         && std::strcmp(__env, "POSIX") != 0)
                        break;
                    }
                else
                  for (; __i < _S_categories_size; ++__i)
                    {
                      __env = std::getenv(_S_categories[__i]);
-                     if (__env && std::strcmp(__env, "") != 0 
-                         && std::strcmp(__env, __res.c_str()) != 0) 
+                     if (__env && std::strcmp(__env, "") != 0
+                         && __res != __env)
                        break;
                    }