diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ff7e2dad426..0e3d55161db 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2011-06-07 Paolo Carlini + + PR libstdc++/49293 + * testsuite/22_locale/time_get/get_weekday/char/38081-1.cc: Tweak + for glibc 2.14. + * testsuite/22_locale/time_get/get_weekday/char/38081-2.cc: Likewise. + 2011-06-06 Paolo Carlini * include/bits/move.h (move_if_noexcept): Use __and_ and __not_. diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc index 7316cc454d0..4e039775ab7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "ru_RU.ISO-8859-5" } -// Copyright (C) 2010 Free Software Foundation +// Copyright (C) 2010, 2011 Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -49,7 +49,11 @@ void test01() // get_weekday(iter_type, iter_type, ios_base&, // ios_base::iostate&, tm*) const +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14) + iss.str("\xbf\xdd\x2e"); +#else iss.str("\xbf\xdd\xd4"); +#endif iterator_type is_it01(iss); tm time01; memset(&time01, -1, sizeof(tm)); @@ -67,7 +71,11 @@ void test01() VERIFY( time02.tm_wday == 1 ); VERIFY( errorstate == ios_base::eofbit ); +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14) + iss.str("\xbf\xdd\x2e\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda"); +#else iss.str("\xbf\xdd\xd4\xd5\xd4\xd5\xdb\xec\xdd\xd8\xda"); +#endif iterator_type is_it03(iss); tm time03; memset(&time03, -1, sizeof(tm)); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc index 1c079a40017..ee8d6769db2 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc @@ -2,7 +2,7 @@ // 2010-01-05 Paolo Carlini -// Copyright (C) 2010 Free Software Foundation +// Copyright (C) 2010, 2011 Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,6 +50,15 @@ void test01() // get_weekday(iter_type, iter_type, ios_base&, // ios_base::iostate&, tm*) const +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 14) + const char* awdays[7] = { "\u0412\u0441\u002E", + "\u041F\u043D\u002E", + "\u0412\u0442\u002E", + "\u0421\u0440\u002E", + "\u0427\u0442\u002E", + "\u041F\u0442\u002E", + "\u0421\u0431\u002E" }; +#else const char* awdays[7] = { "\u0412\u0441\u043A", "\u041F\u043D\u0434", "\u0412\u0442\u0440", @@ -57,6 +66,7 @@ void test01() "\u0427\u0442\u0432", "\u041F\u0442\u043D", "\u0421\u0431\u0442" }; +#endif for (int i = 0; i < 7; ++i) {