From: Paolo Carlini Date: Thu, 5 Feb 2004 20:13:37 +0000 (+0000) Subject: locale_facets.tcc (money_get::do_get(string_type&)): Thousands-sep are always optional... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9010fcacc75ccda1ad4966a870f7d67e120213a;p=gcc.git locale_facets.tcc (money_get::do_get(string_type&)): Thousands-sep are always optional... 2004-02-05 Paolo Carlini * include/bits/locale_facets.tcc (money_get::do_get(string_type&)): Thousands-sep are always optional; thousands-sep are not allowed after the decimal_point. * testsuite/22_locale/money_get/get/char/12.cc: New. * testsuite/22_locale/money_get/get/char/13.cc: New. * testsuite/22_locale/money_get/get/wchar_t/12.cc: New. * testsuite/22_locale/money_get/get/wchar_t/13.cc: New. * testsuite/22_locale/money_get/get/char/1.cc: Clean-up. * testsuite/22_locale/money_get/get/char/2.cc: Likewise. * testsuite/22_locale/money_get/get/char/3.cc: Likewise. * testsuite/22_locale/money_get/get/char/4.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/1.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/2.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/3.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/4.cc: Likewise. * testsuite/22_locale/money_get/get/char/9.cc: Fix citation from the standard. * testsuite/22_locale/money_get/get/wchar_t/9.cc: Likewise. From-SVN: r77339 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6d5ecf1927c..baa27344370 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,26 @@ +2004-02-05 Paolo Carlini + + * include/bits/locale_facets.tcc (money_get::do_get(string_type&)): + Thousands-sep are always optional; thousands-sep are not allowed + after the decimal_point. + * testsuite/22_locale/money_get/get/char/12.cc: New. + * testsuite/22_locale/money_get/get/char/13.cc: New. + * testsuite/22_locale/money_get/get/wchar_t/12.cc: New. + * testsuite/22_locale/money_get/get/wchar_t/13.cc: New. + + * testsuite/22_locale/money_get/get/char/1.cc: Clean-up. + * testsuite/22_locale/money_get/get/char/2.cc: Likewise. + * testsuite/22_locale/money_get/get/char/3.cc: Likewise. + * testsuite/22_locale/money_get/get/char/4.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/1.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/2.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/3.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/4.cc: Likewise. + + * testsuite/22_locale/money_get/get/char/9.cc: Fix citation from + the standard. + * testsuite/22_locale/money_get/get/wchar_t/9.cc: Likewise. + 2004-02-05 Richard Sandiford * config/os/irix/irix6.5/os_defines.h (_GLIBCXX_FIONREAD_TAKES_OFF_T): diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index c0598892a5c..2a3a987ecd1 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1253,11 +1253,15 @@ namespace std } else if (__c == __d && !__testdecfound) { - __grouping_tmp += static_cast(__sep_pos); + // If no grouping chars are seen, no grouping check + // is applied. Therefore __grouping_tmp is adjusted + // only if decimal_point comes after some thousands_sep. + if (__grouping_tmp.size()) + __grouping_tmp += static_cast(__sep_pos); __sep_pos = 0; __testdecfound = true; } - else if (__c == __sep) + else if (__c == __sep && !__testdecfound) { if (__grouping.size()) { @@ -1319,6 +1323,10 @@ namespace std // Test for grouping fidelity. if (__grouping.size() && __grouping_tmp.size()) { + // Add the ending grouping if a decimal wasn't found. + if (!__testdecfound) + __grouping_tmp += static_cast(__sep_pos); + if (!std::__verify_grouping(__grouping.data(), __grouping.size(), __grouping_tmp)) diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc index fd2c1e55c93..b63d384f739 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -36,13 +36,8 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc new file mode 100644 index 00000000000..2b4f32a87f8 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc @@ -0,0 +1,70 @@ +// 2004-02-05 Paolo Carlini + +// Copyright (C) 2004 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.2.6.1.1 money_get members + +#include +#include +#include + +// Same as 3.cc but no thousands-sep in input: they are always optional. +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef istreambuf_iterator iterator_type; + + // basic construction + locale loc_c = locale::classic(); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); + VERIFY( loc_c != loc_de ); + + // total EPA budget FY 2002 + const long double digits1 = 720000000000.0; + + iterator_type end; + istringstream iss; + iss.imbue(loc_de); + // cache the money_get facet + const money_get& mon_get = use_facet >(iss.getloc()); + + iss.str("7200000000,00 "); + iterator_type is_it01(iss); + long double result1; + ios_base::iostate err01 = ios_base::goodbit; + mon_get.get(is_it01, end, true, iss, err01, result1); + VERIFY( result1 == digits1 ); + VERIFY( err01 == ios_base::eofbit ); + + iss.str("7200000000,00 "); + iterator_type is_it02(iss); + long double result2; + ios_base::iostate err02 = ios_base::goodbit; + mon_get.get(is_it02, end, false, iss, err02, result2); + VERIFY( result2 == digits1 ); + VERIFY( err02 == ios_base::eofbit ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc new file mode 100644 index 00000000000..d7040ba237b --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc @@ -0,0 +1,67 @@ +// 2004-02-05 Paolo Carlini + +// Copyright (C) 2004 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.2.6.1.1 money_get members + +#include +#include +#include + +// No thousands-sep allowed after the decimal-point. +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef istreambuf_iterator iterator_type; + + // basic construction + locale loc_c = locale::classic(); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); + VERIFY( loc_c != loc_de ); + + iterator_type end01, end02; + istringstream iss; + iss.imbue(loc_de); + // cache the money_get facet + const money_get& mon_get = use_facet >(iss.getloc()); + + iss.str("500,1.0 "); + iterator_type is_it01(iss); + long double result1; + ios_base::iostate err01 = ios_base::goodbit; + end01 = mon_get.get(is_it01, end01, true, iss, err01, result1); + VERIFY( err01 == ios_base::failbit ); + VERIFY( *end01 == '.' ); + + iss.str("500,1.0 "); + iterator_type is_it02(iss); + long double result2; + ios_base::iostate err02 = ios_base::goodbit; + end02 = mon_get.get(is_it02, end02, false, iss, err02, result2); + VERIFY( err02 == ios_base::failbit ); + VERIFY( *end02 == '.' ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc index 422a53340eb..0d516a28402 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -37,12 +37,7 @@ void test02() // basic construction locale loc_c = locale::classic(); locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); - VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); + VERIFY( loc_c != loc_hk ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc index 5904ee112d8..a717bd9a026 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -36,13 +36,8 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc index a80060aebe0..7c009c85d3b 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -37,12 +37,7 @@ void test04() // basic construction locale loc_c = locale::classic(); locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); - VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); + VERIFY( loc_c != loc_hk ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/9.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/9.cc index cb56e1a362b..a7b4aeeddeb 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/9.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/9.cc @@ -1,6 +1,6 @@ // 2003-05-27 Brendan Kehoe -// Copyright (C) 2003 Free Software Foundation +// Copyright (C) 2003, 2004 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 @@ -18,7 +18,7 @@ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, // USA. -// $22.2.6.3.3/8 +// $22.2.6.3/3 // The number of digits required after the decimal point (if any) is exactly // the value returned by frac_digits(). diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc index a8950723455..8a93e66aa66 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -36,13 +36,8 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc new file mode 100644 index 00000000000..95ecbefb880 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc @@ -0,0 +1,70 @@ +// 2004-02-05 Paolo Carlini + +// Copyright (C) 2004 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.2.6.1.1 money_get members + +#include +#include +#include + +// Same as 3.cc but no thousands-sep in input: they are always optional. +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef istreambuf_iterator iterator_type; + + // basic construction + locale loc_c = locale::classic(); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); + VERIFY( loc_c != loc_de ); + + // total EPA budget FY 2002 + const long double digits1 = 720000000000.0; + + iterator_type end; + wistringstream iss; + iss.imbue(loc_de); + // cache the money_get facet + const money_get& mon_get = use_facet >(iss.getloc()); + + iss.str(L"7200000000,00 "); + iterator_type is_it01(iss); + long double result1; + ios_base::iostate err01 = ios_base::goodbit; + mon_get.get(is_it01, end, true, iss, err01, result1); + VERIFY( result1 == digits1 ); + VERIFY( err01 == ios_base::eofbit ); + + iss.str(L"7200000000,00 "); + iterator_type is_it02(iss); + long double result2; + ios_base::iostate err02 = ios_base::goodbit; + mon_get.get(is_it02, end, false, iss, err02, result2); + VERIFY( result2 == digits1 ); + VERIFY( err02 == ios_base::eofbit ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc new file mode 100644 index 00000000000..564d5fd7798 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc @@ -0,0 +1,67 @@ +// 2004-02-05 Paolo Carlini + +// Copyright (C) 2004 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 22.2.6.1.1 money_get members + +#include +#include +#include + +// No thousands-sep allowed after the decimal-point. +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + typedef istreambuf_iterator iterator_type; + + // basic construction + locale loc_c = locale::classic(); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); + VERIFY( loc_c != loc_de ); + + iterator_type end01, end02; + wistringstream iss; + iss.imbue(loc_de); + // cache the money_get facet + const money_get& mon_get = use_facet >(iss.getloc()); + + iss.str(L"500,1.0 "); + iterator_type is_it01(iss); + long double result1; + ios_base::iostate err01 = ios_base::goodbit; + end01 = mon_get.get(is_it01, end01, true, iss, err01, result1); + VERIFY( err01 == ios_base::failbit ); + VERIFY( *end01 == '.' ); + + iss.str(L"500,1.0 "); + iterator_type is_it02(iss); + long double result2; + ios_base::iostate err02 = ios_base::goodbit; + end02 = mon_get.get(is_it02, end02, false, iss, err02, result2); + VERIFY( err02 == ios_base::failbit ); + VERIFY( *end02 == '.' ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc index f59cef7a929..efdec283e7a 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -37,12 +37,7 @@ void test02() // basic construction locale loc_c = locale::classic(); locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); - VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); + VERIFY( loc_c != loc_hk ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc index d0c8b06b6f3..90c45e8c1a9 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -36,13 +36,8 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc index 8861ce46cf5..cea15f5a85d 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc @@ -1,6 +1,6 @@ // 2001-09-12 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -37,12 +37,7 @@ void test04() // basic construction locale loc_c = locale::classic(); locale loc_hk = __gnu_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); - VERIFY( loc_c != loc_de ); - VERIFY( loc_hk != loc_fr ); - VERIFY( loc_hk != loc_de ); - VERIFY( loc_de != loc_fr ); + VERIFY( loc_c != loc_hk ); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/9.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/9.cc index 989066b392d..ce8ab370972 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/9.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/9.cc @@ -1,6 +1,6 @@ // 2003-05-27 Brendan Kehoe -// Copyright (C) 2003 Free Software Foundation +// Copyright (C) 2003, 2004 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 @@ -18,7 +18,7 @@ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, // USA. -// $22.2.6.3.3/8 +// $22.2.6.3/3 // The number of digits required after the decimal point (if any) is exactly // the value returned by frac_digits().