From c82efc81c00e7fd369092b29530d76292439bf1b Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 25 Jul 2002 06:42:00 +0000 Subject: [PATCH] re PR libstdc++/7222 (g++ 3.1: locale::operator ==() doesn`t work on std::locale("") locales) 2002-07-24 Benjamin Kosnik PR libstdc++/7222 * src/locale.cc (locale::locale(const char*)): Use setlocale NULL. * testsuite/22_locale/ctor_copy_dtor.cc (test02): New. From-SVN: r55736 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/src/locale.cc | 2 +- .../testsuite/22_locale/ctor_copy_dtor.cc | 19 +++++++++++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ce97baad59a..f91fa787354 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-07-24 Benjamin Kosnik + + PR libstdc++/7222 + * src/locale.cc (locale::locale(const char*)): Use setlocale NULL. + * testsuite/22_locale/ctor_copy_dtor.cc (test02): New. + 2002-07-24 Benjamin Kosnik PR libstdc++/7230 diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index 26c2834eb7d..3cb9d1b4cbf 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -202,7 +202,7 @@ namespace std if (strcmp(__s, "C") == 0 || strcmp(__s, "POSIX") == 0) (_M_impl = _S_classic)->_M_add_reference(); else if (strcmp(__s, "") == 0) - _M_impl = new _Impl(setlocale(LC_ALL, __s), 1); + _M_impl = new _Impl(setlocale(LC_ALL, NULL), 1); else _M_impl = new _Impl(__s, 1); } diff --git a/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc b/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc index 8735799c7a8..732ec1714aa 100644 --- a/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc +++ b/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc @@ -25,7 +25,6 @@ #include #include - void test00() { // Should be able to do this as the first thing that happens in a @@ -238,7 +237,21 @@ void test01() } #endif // _GLIBCPP_USE___ENC_TRAITS -int main () +// libstdc++/7222 +void test02() +{ + bool test = true; + std::locale loc_c1("C"); + std::locale loc_c2 ("C"); + + std::locale loc_1(""); + std::locale loc_2(""); + + VERIFY( loc_c1 == loc_c2 ); + VERIFY( loc_1 == loc_2 ); +} + +int main() { test00(); @@ -246,5 +259,7 @@ int main () test01(); #endif + test02(); + return 0; } -- 2.30.2