diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2003-07-06 11:37:11 +0200 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-07-06 09:37:11 +0000 |
| commit | 391cfc46896ec536a390f09b192b58c558e02b05 (patch) | |
| tree | 7288a565b403e26864d9d0e0b5786ccdaa992d4a /libstdc++-v3/src/locale.cc | |
| parent | 1d088deebefc04b8c99fe00e4df4e9c4ddacec2d (diff) | |
| download | gcc-391cfc46896ec536a390f09b192b58c558e02b05.tar.gz | |
locale_classes.h: Fully qualify standard functions with std::, thus avoiding Koenig lookup.
2003-07-06 Paolo Carlini <pcarlini@unitus.it>
* include/bits/locale_classes.h: Fully qualify standard
functions with std::, thus avoiding Koenig lookup.
* include/bits/locale_facets.tcc: Likewise.
* src/locale.cc: Likewise.
* src/localename.cc: Likewise.
From-SVN: r68997
Diffstat (limited to 'libstdc++-v3/src/locale.cc')
| -rw-r--r-- | libstdc++-v3/src/locale.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index e10abee991c..c6be06928ca 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -176,18 +176,18 @@ namespace std if (__s) { _S_initialize(); - if (strcmp(__s, "C") == 0 || strcmp(__s, "POSIX") == 0) + if (std::strcmp(__s, "C") == 0 || std::strcmp(__s, "POSIX") == 0) (_M_impl = _S_classic)->_M_add_reference(); - else if (strcmp(__s, "") != 0) + else if (std::strcmp(__s, "") != 0) _M_impl = new _Impl(__s, 1); else { // Get it from the environment. char* __env = getenv("LC_ALL"); // If LC_ALL is set we are done. - if (__env && strcmp(__env, "") != 0) + if (__env && std::strcmp(__env, "") != 0) { - if (strcmp(__env, "C") == 0 || strcmp(__env, "POSIX") == 0) + if (std::strcmp(__env, "C") == 0 || std::strcmp(__env, "POSIX") == 0) (_M_impl = _S_classic)->_M_add_reference(); else _M_impl = new _Impl(__env, 1); @@ -197,8 +197,8 @@ namespace std char* __res; // LANG may set a default different from "C". char* __env = getenv("LANG"); - if (!__env || strcmp(__env, "") == 0 || strcmp(__env, "C") == 0 - || strcmp(__env, "POSIX") == 0) + if (!__env || std::strcmp(__env, "") == 0 || std::strcmp(__env, "C") == 0 + || std::strcmp(__env, "POSIX") == 0) __res = strdup("C"); else __res = strdup(__env); @@ -206,21 +206,21 @@ namespace std // Scan the categories looking for the first one // different from LANG. size_t __i = 0; - if (strcmp(__res, "C") == 0) + if (std::strcmp(__res, "C") == 0) for (; __i < _S_categories_size; ++__i) { __env = getenv(_S_categories[__i]); - if (__env && strcmp(__env, "") != 0 - && strcmp(__env, "C") != 0 - && strcmp(__env, "POSIX") != 0) + if (__env && std::strcmp(__env, "") != 0 + && std::strcmp(__env, "C") != 0 + && std::strcmp(__env, "POSIX") != 0) break; } else for (; __i < _S_categories_size; ++__i) { __env = getenv(_S_categories[__i]); - if (__env && strcmp(__env, "") != 0 - && strcmp(__env, __res) != 0) + if (__env && std::strcmp(__env, "") != 0 + && std::strcmp(__env, __res) != 0) break; } @@ -244,15 +244,15 @@ namespace std for (; __i < _S_categories_size; ++__i) { __env = getenv(_S_categories[__i]); - if (!__env || strcmp(__env, "") == 0) + if (!__env || std::strcmp(__env, "") == 0) { __str += _S_categories[__i]; __str += '='; __str += __res; __str += ';'; } - else if (strcmp(__env, "C") == 0 - || strcmp(__env, "POSIX") == 0) + else if (std::strcmp(__env, "C") == 0 + || std::strcmp(__env, "POSIX") == 0) { __str += _S_categories[__i]; __str += "=C;"; @@ -270,7 +270,7 @@ namespace std } // ... otherwise either an additional instance of // the "C" locale or LANG. - else if (strcmp(__res, "C") == 0) + else if (std::strcmp(__res, "C") == 0) (_M_impl = _S_classic)->_M_add_reference(); else _M_impl = new _Impl(__res, 1); @@ -323,7 +323,7 @@ namespace std __other._M_impl->_M_add_reference(); _S_global = __other._M_impl; if (_S_global->_M_check_same_name() - && (strcmp(_S_global->_M_names[0], "*") != 0)) + && (std::strcmp(_S_global->_M_names[0], "*") != 0)) setlocale(LC_ALL, __other.name().c_str()); // Reference count sanity check: one reference removed for the |