diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale')
56 files changed, 232 insertions, 210 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc index 4a96797bf52..2df9553a35d 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/1.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003, 2009, 2010 +// Free Software Foundation, Inc. // // 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 @@ -84,8 +85,8 @@ void test01() std::ctype_base::mask m01[3]; std::ctype_base::mask m02[13]; const char_type* cc0 = strlit00; - const char_type* cc1 = NULL; - const char_type* cc2 = NULL; + const char_type* cc1 = 0; + const char_type* cc2 = 0; cc0 = strlit00; for (std::size_t i = 0; i < 3; ++i) diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc index cf2f845ca3b..0b989cbe729 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/1.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003, 2009, 2010 +// Free Software Foundation, Inc. // // 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 @@ -84,8 +85,8 @@ void test01() std::ctype_base::mask m01[3]; std::ctype_base::mask m02[13]; const char_type* cc0 = strlit00; - const char_type* cc1 = NULL; - const char_type* cc2 = NULL; + const char_type* cc1 = 0; + const char_type* cc2 = 0; cc0 = strlit00; for (std::size_t i = 0; i < 3; ++i) diff --git a/libstdc++-v3/testsuite/22_locale/ctype_base/mask.cc b/libstdc++-v3/testsuite/22_locale/ctype_base/mask.cc index aec9f31607b..f503ce7f41e 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype_base/mask.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype_base/mask.cc @@ -1,7 +1,7 @@ // { dg-do compile } // 1999-08-24 bkoz -// Copyright (C) 1999, 2000, 2003, 2009 Free Software Foundation +// Copyright (C) 1999, 2000, 2003, 2009, 2010 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 @@ -43,6 +43,8 @@ test01() res = m01 | m02; res = m01 ^ m02; res = ~m01; + res = res; // Suppress unused warning. + m01 &= m02; m01 |= m02; m01 ^= m02; diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc index d7ad84137da..f36559ea27c 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc @@ -3,7 +3,7 @@ // { dg-options "-pthreads" { target *-*-solaris* } } // { dg-require-namedlocale "" } -// Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2007, 2009, 2010 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 @@ -59,10 +59,10 @@ main() pthread_t tid[max_thread_count]; for (int i = 0; i < max_thread_count; i++) - pthread_create (&tid[i], NULL, thread_main, 0); + pthread_create (&tid[i], 0, thread_main, 0); for (int i = 0; i < max_thread_count; i++) - pthread_join (tid[i], NULL); + pthread_join (tid[i], 0); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc index 2d92afcad39..5b882cce683 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc @@ -3,7 +3,7 @@ // { dg-options "-pthreads" { target *-*-solaris* } } // { dg-require-namedlocale "" } -// Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2007, 2009, 2010 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 @@ -55,10 +55,10 @@ main() loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR"); for (int i = 0; i < max_thread_count; i++) - pthread_create(&tid[i], NULL, thread_main, 0); + pthread_create(&tid[i], 0, thread_main, 0); for (int i = 0; i < max_thread_count; i++) - pthread_join(tid[i], NULL); + pthread_join(tid[i], 0); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc index c5c70dcc9d7..c09b000130e 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc @@ -2,7 +2,8 @@ // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +// 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -96,7 +97,7 @@ void test01() VERIFY( loc07 != loc02 ); VERIFY( loc07.name() != "" ); try - { locale loc08(static_cast<const char*>(NULL)); } + { locale loc08(static_cast<const char*>(0)); } catch(runtime_error& obj) { VERIFY( true ); } catch(...) @@ -130,7 +131,7 @@ void test01() VERIFY( loc11 == loc01 ); try - { locale loc12(loc01, static_cast<const char*>(NULL), locale::ctype); } + { locale loc12(loc01, static_cast<const char*>(0), locale::ctype); } catch(runtime_error& obj) { VERIFY( true ); } catch(...) @@ -178,7 +179,7 @@ void test01() VERIFY( loc11 == loc01 ); try - { locale loc12(loc01, static_cast<const char*>(NULL), locale::ctype); } + { locale loc12(loc01, static_cast<const char*>(0), locale::ctype); } catch(runtime_error& obj) { VERIFY( true ); } catch(...) diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc index 428efc952b6..6693f5d2d6d 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/29217.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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,7 +36,7 @@ void test01() "LC_PAPER=C;LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;" "LC_MEASUREMENT=C;LC_IDENTIFICATION=C" ); - VERIFY( locale().name() == setlocale(LC_ALL, NULL) ); + VERIFY( locale().name() == setlocale(LC_ALL, 0) ); locale loc1 = locale(locale::classic(), "en_US.UTF-8", locale::time); diff --git a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc index 4927e5647a1..30e133fd49a 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc @@ -2,7 +2,7 @@ // 2004-02-09 Petur Runolfsson <peturr02@ru.is> -// Copyright (C) 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2009, 2010 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 @@ -39,7 +39,7 @@ void test01() if (loc.name() != "*") { locale::global(loc); - VERIFY( loc.name() == setlocale(LC_ALL, NULL) ); + VERIFY( loc.name() == setlocale(LC_ALL, 0) ); } } diff --git a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc index 21d52fd4b2e..3265f71a29c 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc @@ -2,7 +2,7 @@ // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2000, 2002, 2003, 2005, 2009 Free Software Foundation +// Copyright (C) 2000, 2002, 2003, 2005, 2009, 2010 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 @@ -33,7 +33,7 @@ void test02() const string ph("en_PH"); const string mx("es_MX"); - const char* orig = setlocale(LC_ALL, NULL); + const char* orig = setlocale(LC_ALL, 0); const char* testph = setlocale(LC_ALL, ph.c_str()); const char* testmx = setlocale(LC_ALL, mx.c_str()); setlocale(LC_ALL, orig); @@ -54,7 +54,7 @@ void test02() // Change global locale. locale global_orig = locale::global(loc_mx); - const char* lc_all_mx = setlocale(LC_ALL, NULL); + const char* lc_all_mx = setlocale(LC_ALL, 0); if (lc_all_mx) { VERIFY( mx == lc_all_mx ); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc index 0a76d4334d0..0dad40accf5 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc @@ -2,7 +2,8 @@ // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 +// 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 @@ -52,12 +53,12 @@ void test01() oss.imbue(loc_de); const money_put<char>& mon_put = use_facet<money_put<char> >(oss.getloc()); - iterator_type os_it01 = mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); string result1 = oss.str(); VERIFY( result1 == "7.200.000.000,00 "); oss.str(empty); - iterator_type os_it02 = mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); string result2 = oss.str(); VERIFY( result2 == "7.200.000.000,00 "); @@ -68,12 +69,12 @@ void test01() oss.setf(ios_base::showbase); oss.str(empty); - iterator_type os_it03 = mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); string result3 = oss.str(); VERIFY( result3 == "7.200.000.000,00 EUR "); oss.str(empty); - iterator_type os_it04 = mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); string result4 = oss.str(); VERIFY( result4 == "7.200.000.000,00 \244"); @@ -88,14 +89,14 @@ void test01() // test various fill strategies oss.str(empty); oss.width(20); - iterator_type os_it10 = mon_put.put(oss.rdbuf(), true, oss, '*', digits2); + mon_put.put(oss.rdbuf(), true, oss, '*', digits2); string result10 = oss.str(); VERIFY( result10 == "***************-,01*"); oss.str(empty); oss.width(20); oss.setf(ios_base::internal); - iterator_type os_it11 = mon_put.put(oss.rdbuf(), true, oss, '*', digits2); + mon_put.put(oss.rdbuf(), true, oss, '*', digits2); string result11 = oss.str(); VERIFY( result11 == "-,01****************"); } diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/12971.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/12971.cc index 15efd377e00..5ccb9ba4afc 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/12971.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/12971.cc @@ -1,6 +1,6 @@ // 2003-11-09 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 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,7 +37,7 @@ void test01() ostringstream oss; const money_put<char>& mon_put = use_facet<money_put<char> >(oss.getloc()); - iterator_type os_it01 = mon_put.put(oss.rdbuf(), true, oss, ' ', amount); + mon_put.put(oss.rdbuf(), true, oss, ' ', amount); string result = oss.str(); VERIFY( result == "11" ); } diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc index b3defe8b279..7707c7e2a42 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc @@ -2,7 +2,8 @@ // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 +// 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 @@ -63,12 +64,12 @@ void test02() // test sign of more than one digit, say hong kong. oss.str(empty); - iterator_type os_it05 = mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); string result5 = oss.str(); VERIFY( result5 == "HK$7,200,000,000.00"); oss.str(empty); - iterator_type os_it06 = mon_put.put(oss.rdbuf(), true, oss, ' ', digits2); + mon_put.put(oss.rdbuf(), true, oss, ' ', digits2); string result6 = oss.str(); VERIFY( result6 == "(HKD 100,000,000,000.00)"); @@ -76,7 +77,7 @@ void test02() oss.imbue(loc_c); oss.str(empty); const money_put<char>& mon_put2 = use_facet<money_put<char> >(oss.getloc()); - iterator_type os_it07 = mon_put2.put(oss.rdbuf(), true, oss, ' ', digits4); + mon_put2.put(oss.rdbuf(), true, oss, ' ', digits4); string result7 = oss.str(); VERIFY( result7 == "1"); @@ -84,7 +85,7 @@ void test02() oss.imbue(loc_hk); oss.str(empty); const money_put<char>& mon_put3 = use_facet<money_put<char> >(oss.getloc()); - iterator_type os_it08 = mon_put3.put(oss.rdbuf(), true, oss, ' ', digits4); + mon_put3.put(oss.rdbuf(), true, oss, ' ', digits4); string result8 = oss.str(); VERIFY( result8 == "(HKD .01)"); @@ -92,7 +93,7 @@ void test02() // test bunk input oss.str(empty); - iterator_type os_it09 = mon_put.put(oss.rdbuf(), true, oss, ' ', digits3); + mon_put.put(oss.rdbuf(), true, oss, ' ', digits3); string result9 = oss.str(); VERIFY( result9 == ""); } diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc index 6f571fda828..609bb7f6373 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc @@ -2,7 +2,8 @@ // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 +// 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,12 +50,12 @@ void test03() oss.imbue(loc_de); const money_put<char>& mon_put = use_facet<money_put<char> >(oss.getloc()); - iterator_type os_it01 = mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); string result1 = oss.str(); VERIFY( result1 == "7.200.000.000,00 "); oss.str(empty); - iterator_type os_it02 = mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); string result2 = oss.str(); VERIFY( result2 == "7.200.000.000,00 "); @@ -65,12 +66,12 @@ void test03() oss.setf(ios_base::showbase); oss.str(empty); - iterator_type os_it03 = mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, ' ', digits1); string result3 = oss.str(); VERIFY( result3 == "7.200.000.000,00 EUR "); oss.str(empty); - iterator_type os_it04 = mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, ' ', digits1); string result4 = oss.str(); VERIFY( result4 == "7.200.000.000,00 \244"); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc index 1fceb279971..d48b8aa320c 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc @@ -2,7 +2,8 @@ // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 +// 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 @@ -53,12 +54,12 @@ void test01() const money_put<wchar_t>& mon_put = use_facet<money_put<wchar_t> >(oss.getloc()); - iterator_type os_it01 = mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); wstring result1 = oss.str(); VERIFY( result1 == L"7.200.000.000,00 " ); oss.str(empty); - iterator_type os_it02 = mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); wstring result2 = oss.str(); VERIFY( result2 == L"7.200.000.000,00 " ); @@ -69,12 +70,12 @@ void test01() oss.setf(ios_base::showbase); oss.str(empty); - iterator_type os_it03 = mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); wstring result3 = oss.str(); VERIFY( result3 == L"7.200.000.000,00 EUR " ); oss.str(empty); - iterator_type os_it04 = mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); wstring result4 = oss.str(); VERIFY( result4 == L"7.200.000.000,00 \x20ac" ); @@ -89,14 +90,14 @@ void test01() // test various fill strategies oss.str(empty); oss.width(20); - iterator_type os_it10 = mon_put.put(oss.rdbuf(), true, oss, L'*', digits2); + mon_put.put(oss.rdbuf(), true, oss, L'*', digits2); wstring result10 = oss.str(); VERIFY( result10 == L"***************-,01*" ); oss.str(empty); oss.width(20); oss.setf(ios_base::internal); - iterator_type os_it11 = mon_put.put(oss.rdbuf(), true, oss, L'*', digits2); + mon_put.put(oss.rdbuf(), true, oss, L'*', digits2); wstring result11 = oss.str(); VERIFY( result11 == L"-,01****************" ); } diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/12971.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/12971.cc index fd8bcf517e1..cd430a9e1bd 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/12971.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/12971.cc @@ -1,6 +1,6 @@ // 2003-11-09 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2003, 2004, 2009 Free Software Foundation +// Copyright (C) 2003, 2004, 2009, 2010 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 @@ -38,7 +38,7 @@ void test01() const money_put<wchar_t>& mon_put = use_facet<money_put<wchar_t> >(oss.getloc()); - iterator_type os_it01 = mon_put.put(oss.rdbuf(), true, oss, L' ', amount); + mon_put.put(oss.rdbuf(), true, oss, L' ', amount); wstring result = oss.str(); VERIFY( result == L"11" ); } diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc index 33f7727458b..592c913f084 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc @@ -2,7 +2,8 @@ // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 +// 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 @@ -64,12 +65,12 @@ void test02() // test sign of more than one digit, say hong kong. oss.str(empty); - iterator_type os_it05 = mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); wstring result5 = oss.str(); VERIFY( result5 == L"HK$7,200,000,000.00" ); oss.str(empty); - iterator_type os_it06 = mon_put.put(oss.rdbuf(), true, oss, L' ', digits2); + mon_put.put(oss.rdbuf(), true, oss, L' ', digits2); wstring result6 = oss.str(); VERIFY( result6 == L"(HKD 100,000,000,000.00)" ); @@ -78,7 +79,7 @@ void test02() oss.str(empty); const money_put<wchar_t>& mon_put2 = use_facet<money_put<wchar_t> >(oss.getloc()); - iterator_type os_it07 = mon_put2.put(oss.rdbuf(), true, oss, L' ', digits4); + mon_put2.put(oss.rdbuf(), true, oss, L' ', digits4); wstring result7 = oss.str(); VERIFY( result7 == L"1" ); @@ -87,7 +88,7 @@ void test02() oss.str(empty); const money_put<wchar_t>& mon_put3 = use_facet<money_put<wchar_t> >(oss.getloc()); - iterator_type os_it08 = mon_put3.put(oss.rdbuf(), true, oss, L' ', digits4); + mon_put3.put(oss.rdbuf(), true, oss, L' ', digits4); wstring result8 = oss.str(); VERIFY( result8 == L"(HKD .01)" ); @@ -95,7 +96,7 @@ void test02() // test bunk input oss.str(empty); - iterator_type os_it09 = mon_put.put(oss.rdbuf(), true, oss, L' ', digits3); + mon_put.put(oss.rdbuf(), true, oss, L' ', digits3); wstring result9 = oss.str(); VERIFY( result9 == L"" ); } diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc index a0fbcda9e09..798745bac0e 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc @@ -2,7 +2,8 @@ // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 +// 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,12 +51,12 @@ void test03() const money_put<wchar_t>& mon_put = use_facet<money_put<wchar_t> >(oss.getloc()); - iterator_type os_it01 = mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); wstring result1 = oss.str(); VERIFY( result1 == L"7.200.000.000,00 " ); oss.str(empty); - iterator_type os_it02 = mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); wstring result2 = oss.str(); VERIFY( result2 == L"7.200.000.000,00 " ); @@ -66,12 +67,12 @@ void test03() oss.setf(ios_base::showbase); oss.str(empty); - iterator_type os_it03 = mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), true, oss, L' ', digits1); wstring result3 = oss.str(); VERIFY( result3 == L"7.200.000.000,00 EUR " ); oss.str(empty); - iterator_type os_it04 = mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); + mon_put.put(oss.rdbuf(), false, oss, L' ', digits1); wstring result4 = oss.str(); VERIFY( result4 == L"7.200.000.000,00 \x20ac" ); diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/1.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/1.cc index fac61ec3d58..fd28b63fbeb 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/1.cc @@ -1,6 +1,6 @@ // 2001-08-23 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2009, 2010 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 @@ -59,6 +59,8 @@ void test01() pattern neg1 = monp_c_t.neg_format(); pattern pos2 = monp_c_f.pos_format(); pattern neg2 = monp_c_f.neg_format(); + neg1 = neg1; + neg2 = neg2; VERIFY( q1 == '.' ); VERIFY( q3 == '.' ); diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/1.cc index bb862deda25..eb5e50684be 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/1.cc @@ -1,6 +1,6 @@ // 2001-08-23 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2009, 2010 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 @@ -59,6 +59,8 @@ void test01() pattern neg1 = monp_c_t.neg_format(); pattern pos2 = monp_c_f.pos_format(); pattern neg2 = monp_c_f.neg_format(); + neg1 = neg1; + neg2 = neg2; VERIFY( q1 == L'.' ); VERIFY( q3 == L'.' ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc index dd849c6fca8..c951c4c3e5e 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc @@ -2,7 +2,7 @@ // 2001-11-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -63,7 +63,7 @@ void test01() // bool, simple iss.str("1"); iterator_type os_it00 = iss.rdbuf(); - iterator_type os_it01 = ng.get(os_it00, 0, iss, err, b1); + ng.get(os_it00, 0, iss, err, b1); VERIFY( b1 == true ); VERIFY( err & ios_base::eofbit ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc index d36f5caf019..8b4884738a7 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc @@ -2,7 +2,7 @@ // 2001-11-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -63,7 +63,7 @@ void test01() // bool, simple iss.str(L"1"); iterator_type os_it00 = iss.rdbuf(); - iterator_type os_it01 = ng.get(os_it00, 0, iss, err, b1); + ng.get(os_it00, 0, iss, err, b1); VERIFY( b1 == true ); VERIFY( err & ios_base::eofbit ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc index 1398aeeaa72..df1a86dca3f 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc @@ -2,7 +2,8 @@ // 2001-11-19 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 +// 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 @@ -61,7 +62,7 @@ void test01() // bool, simple iterator_type os_it00 = oss.rdbuf(); - iterator_type os_it01 = np.put(os_it00, oss, '+', b1); + np.put(os_it00, oss, '+', b1); result1 = oss.str(); VERIFY( result1 == "1" ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc index 83da0d2802e..01b06d6b552 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc @@ -2,7 +2,7 @@ // 2001-11-19 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -62,7 +62,7 @@ void test01() // bool, simple iterator_type os_it00 = oss.rdbuf(); - iterator_type os_it01 = np.put(os_it00, oss, L'+', b1); + np.put(os_it00, oss, L'+', b1); result1 = oss.str(); VERIFY( result1 == L"1" ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/5.cc index 5a31f33565a..f08cd6f0761 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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 @@ -48,7 +48,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const string str0 = "1"; - iter_type end0 = tg.get_date(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_date(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_year == 0 ); VERIFY( tm0.tm_mon == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/5.cc index 194e1505901..9110884fae9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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 @@ -48,7 +48,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const wstring str0 = L"1"; - iter_type end0 = tg.get_date(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_date(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_year == 0 ); VERIFY( tm0.tm_mon == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/5.cc index 64b0a2e6b21..c1966fe4b95 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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 @@ -48,7 +48,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const string str0 = "S"; - iter_type end0 = tg.get_monthname(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_monthname(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_mon == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/5.cc index 5b48a30f88a..192d19c945b 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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 @@ -48,7 +48,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const wstring str0 = L"S"; - iter_type end0 = tg.get_monthname(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_monthname(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_mon == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/5.cc index f0808bf8a88..b099b6e7ba4 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const string str0 = "1"; - iter_type end0 = tg.get_time(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_time(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_sec == 0 ); VERIFY( tm0.tm_min == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/5.cc index b06ccf6ffb8..ffce43218cd 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const wstring str0 = L"1"; - iter_type end0 = tg.get_time(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_time(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_sec == 0 ); VERIFY( tm0.tm_min == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/5.cc index 1583f107d6d..4157a08b560 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const string str0 = "T"; - iter_type end0 = tg.get_weekday(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_weekday(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm1.tm_wday == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/5.cc index 29de6a26d59..02664bf0b3d 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const wstring str0 = L"T"; - iter_type end0 = tg.get_weekday(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_weekday(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm1.tm_wday == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/5.cc index 0f6e5a92a04..f3a47bf87b5 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const string str0 = "1"; - iter_type end0 = tg.get_year(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_year(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_year == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/5.cc index 6c5cbf194ce..c932bebdb64 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/5.cc @@ -1,6 +1,6 @@ // 2006-06-16 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2010 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,7 @@ void test01() const time_get_type& tg = use_facet<time_get_type>(iss.getloc()); const wstring str0 = L"1"; - iter_type end0 = tg.get_year(str0.begin(), str0.end(), iss, err, &tm0); + tg.get_year(str0.begin(), str0.end(), iss, err, &tm0); VERIFY( err == (failbit | eofbit) ); VERIFY( tm0.tm_year == 0 ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc index 8fed3437a57..32388cc6f0b 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc @@ -1,6 +1,6 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -48,27 +48,27 @@ void test01() // put(iter_type s, ios_base& str, char_type fill, const tm* t, // char format, char modifier = 0) const; oss.str(empty); - iterator_type os_it01 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); string result1 = oss.str(); VERIFY( result1 == "Sun" ); oss.str(empty); - iterator_type os_it21 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result21 = oss.str(); // "04/04/71" VERIFY( result21 == "04/04/71" ); oss.str(empty); - iterator_type os_it22 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); string result22 = oss.str(); // "12:00:00" VERIFY( result22 == "12:00:00" ); oss.str(empty); - iterator_type os_it31 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result31 = oss.str(); // "04/04/71" VERIFY( result31 == "04/04/71" ); oss.str(empty); - iterator_type os_it32 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result32 = oss.str(); // "12:00:00" VERIFY( result32 == "12:00:00" ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc index 7de5471495f..3c6ad92e483 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 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 @@ -47,7 +47,7 @@ void test01() bool test __attribute__((unused)) = true; ostringstream stream; - time_t tt = time(NULL); + time_t tt = time(0); const char* fmt = "%c"; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc index 54d4cde7cef..3d19d36c20b 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/12439_3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 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 @@ -46,7 +46,7 @@ void test03() bool test __attribute__((unused)) = true; ostringstream stream; - time_t tt = time(NULL); + time_t tt = time(0); const char* fmt = "%c"; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc index 318c05dc2d3..77f2972ca6e 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc @@ -2,7 +2,7 @@ // 2004-08-25 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2006, 2009, 2010 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 @@ -47,7 +47,7 @@ void test01() const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc()); - iterator_type os_it01 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'c'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'c'); string result1 = oss.str(); char time_buffer[128]; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc index 7c65ad9985b..255636cbd2c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -47,27 +47,27 @@ void test02() oss.imbue(loc_de); const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc()); - iterator_type os_it02 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); string result2 = oss.str(); VERIFY( result2 == "Son" || result2 == "So" ); oss.str(empty); // "%d.%m.%Y" - iterator_type os_it23 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result23 = oss.str(); // "04.04.1971" VERIFY( result23 == "04.04.1971" ); oss.str(empty); // "%T" - iterator_type os_it24 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); string result24 = oss.str(); // "12:00:00" VERIFY( result24 == "12:00:00" ); oss.str(empty); - iterator_type os_it33 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result33 = oss.str(); // "04.04.1971" VERIFY( result33 == "04.04.1971" ); oss.str(empty); - iterator_type os_it34 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result34 = oss.str(); // "12:00:00" VERIFY( result34 == "12:00:00" ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc index c71b5e46d26..6b9b330aef7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -47,27 +47,27 @@ void test03() oss.imbue(loc_hk); const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc()); - iterator_type os_it03 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); string result3 = oss.str(); VERIFY( result3 == "Sun" ); oss.str(empty); // "%A, %B %d, %Y" - iterator_type os_it25 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result25 = oss.str(); // "Sunday, April 04, 1971" VERIFY( result25 == "Sunday, April 04, 1971" ); oss.str(empty); // "%I:%M:%S %Z" - iterator_type os_it26 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); string result26 = oss.str(); // "12:00:00 CET" or whatever timezone VERIFY( result26.find("12:00:00") != string::npos ); oss.str(empty); - iterator_type os_it35 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result35 = oss.str(); // "Sunday, April 04, 1971" VERIFY( result35 == "Sunday, April 04, 1971" ); oss.str(empty); - iterator_type os_it36 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result36 = oss.str(); // "12:00:00 CET" VERIFY( result36.find("12:00:00") != string::npos ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc index 196c1aa9088..21b9725c6b9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc @@ -2,7 +2,8 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +// 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -46,27 +47,27 @@ void test04() ostringstream oss; oss.imbue(loc_es); const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc()); - iterator_type os_it04 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'a'); string result4 = oss.str(); VERIFY( result4 == "dom" ); oss.str(empty); // "%d/%m/%y" - iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x'); string result27 = oss.str(); // "04/04/71" VERIFY( result27 == "04/04/71" ); oss.str(empty); // "%T" - iterator_type os_it28 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X'); string result28 = oss.str(); // "12:00:00" VERIFY( result28 == "12:00:00" ); oss.str(empty); - iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'x', 'E'); string result37 = oss.str(); // "04/04/71" VERIFY( result37 == "04/04/71" ); oss.str(empty); - iterator_type os_it38 = tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, '*', &time1, 'X', 'E'); string result38 = oss.str(); // "12:00:00" VERIFY( result38 == "12:00:00" ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc index 2f9c6a6bc64..96ce947c2af 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc @@ -1,6 +1,6 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -48,13 +48,12 @@ void test05() // 2 oss.str(empty); - iterator_type os_it05 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date, date + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date, date + traits::length(date)); string result5 = oss.str(); VERIFY( result5 == "Sunday, the second of April"); - iterator_type os_it06 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date_ex, - date_ex + traits::length(date_ex)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date_ex, date_ex + traits::length(date_ex)); string result6 = oss.str(); VERIFY( result6 != result5 ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc index ff3938cc9e4..9e144ffcb03 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -50,13 +50,12 @@ void test06() oss.imbue(loc_de); const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc()); - iterator_type os_it07 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date, date + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date, date + traits::length(date)); string result7 = oss.str(); VERIFY( result7 == "Sonntag, the second of April"); - iterator_type os_it08 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date_ex, - date_ex + traits::length(date_ex)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date_ex, date_ex + traits::length(date_ex)); string result8 = oss.str(); VERIFY( result8 != result7 ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc index 93b139d95d1..67f1aa580f6 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -50,13 +50,12 @@ void test07() oss.imbue(loc_hk); const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc()); - iterator_type os_it09 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date, date + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date, date + traits::length(date)); string result9 = oss.str(); VERIFY( result9 == "Sunday, the second of April"); - iterator_type os_it10 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date_ex, - date_ex + traits::length(date_ex)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date_ex, date_ex + traits::length(date_ex)); string result10 = oss.str(); VERIFY( result10 != result9 ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc index 2834954616a..c3fc4d83acd 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -49,13 +49,12 @@ void test08() ostringstream oss; oss.imbue(loc_fr); const time_put<char>& tim_put = use_facet<time_put<char> >(oss.getloc()); - iterator_type os_it11 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date, date + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date, date + traits::length(date)); string result11 = oss.str(); VERIFY( result11 == "dimanche, the second of avril"); - iterator_type os_it12 = tim_put.put(oss.rdbuf(), oss, '*', &time1, - date_ex, - date_ex + traits::length(date_ex)); + tim_put.put(oss.rdbuf(), oss, '*', &time1, + date_ex, date_ex + traits::length(date_ex)); string result12 = oss.str(); VERIFY( result12 != result11 ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc index 2ed02a5daa9..23259753199 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc @@ -1,6 +1,6 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,34 +43,35 @@ void test01() const wstring empty; wostringstream oss; oss.imbue(loc_c); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); // 1 // iter_type // put(iter_type s, ios_base& str, char_type fill, const tm* t, // char format, char modifier = 0) const; oss.str(empty); - iterator_type os_it01 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); wstring result1 = oss.str(); VERIFY( result1 == L"Sun" ); oss.str(empty); - iterator_type os_it21 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result21 = oss.str(); // "04/04/71" VERIFY( result21 == L"04/04/71" ); oss.str(empty); - iterator_type os_it22 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); wstring result22 = oss.str(); // "12:00:00" VERIFY( result22 == L"12:00:00" ); oss.str(empty); - iterator_type os_it31 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result31 = oss.str(); // "04/04/71" VERIFY( result31 == L"04/04/71" ); oss.str(empty); - iterator_type os_it32 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result32 = oss.str(); // "12:00:00" VERIFY( result32 == L"12:00:00" ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_1.cc index 159b8f193bd..1298fa9e5e9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 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 @@ -45,7 +45,7 @@ void test01() bool test __attribute__((unused)) = true; wostringstream stream; - time_t tt = time(NULL); + time_t tt = time(0); const wchar_t* fmt = L"%c"; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_2.cc index 515c998c2b1..c231354743e 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 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 @@ -42,7 +42,7 @@ void test02() locale loc; const tp_type& tp = use_facet<tp_type>(loc); - time_t tt = time(NULL); + time_t tt = time(0); wostringstream stream; tp.put(tp_type::iter_type(stream), stream, stream.fill(), diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_3.cc index 8127c75ea47..2ec4225ba9c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/12439_3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation +// Copyright (C) 2003, 2009, 2010 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 @@ -44,7 +44,7 @@ void test03() bool test __attribute__((unused)) = true; wostringstream stream; - time_t tt = time(NULL); + time_t tt = time(0); const wchar_t* fmt = L"%c"; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc index d4f90468869..088acf2f3f4 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc @@ -2,7 +2,7 @@ // 2004-08-25 Paolo Carlini <pcarlini@suse.de> -// Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2006, 2009, 2010 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 @@ -47,7 +47,7 @@ void test01() const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it01 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'c'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'c'); wstring result1 = oss.str(); wchar_t time_buffer[128]; diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc index c8cc42c2cf7..7ead914b166 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -45,29 +45,30 @@ void test02() const wstring empty; wostringstream oss; oss.imbue(loc_de); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it02 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); wstring result2 = oss.str(); VERIFY( result2 == L"Son" || result2 == L"So" ); oss.str(empty); // "%d.%m.%Y" - iterator_type os_it23 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result23 = oss.str(); // "04.04.1971" VERIFY( result23 == L"04.04.1971" ); oss.str(empty); // "%T" - iterator_type os_it24 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); wstring result24 = oss.str(); // "12:00:00" VERIFY( result24 == L"12:00:00" ); oss.str(empty); - iterator_type os_it33 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result33 = oss.str(); // "04.04.1971" VERIFY( result33 == L"04.04.1971" ); oss.str(empty); - iterator_type os_it34 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result34 = oss.str(); // "12:00:00" VERIFY( result34 == L"12:00:00" ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc index eec2fa7a358..6e099d64a76 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -45,32 +45,32 @@ void test03() const wstring empty; wostringstream oss; oss.imbue(loc_hk); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it03 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); wstring result3 = oss.str(); VERIFY( result3 == L"Sun" ); oss.str(empty); // "%A, %B %d, %Y" - iterator_type os_it25 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result25 = oss.str(); // "Sunday, April 04, 1971" VERIFY( result25 == L"Sunday, April 04, 1971" ); oss.str(empty); // "%I:%M:%S %Z" - iterator_type os_it26 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); wstring result26 = oss.str(); // "12:00:00 CET" or whatever timezone VERIFY( result26.find(L"12:00:00") != wstring::npos ); oss.str(empty); - iterator_type os_it35 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result35 = oss.str(); // "Sunday, April 04, 1971" VERIFY( result35 == L"Sunday, April 04, 1971" ); oss.str(empty); - iterator_type os_it36 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result36 = oss.str(); // "12:00:00 CET" VERIFY( result36.find(L"12:00:00") != wstring::npos ); - } int main() diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc index e56f14ebbd5..0ae2a1f8898 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc @@ -2,7 +2,8 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +// 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -45,28 +46,30 @@ void test04() const wstring empty; wostringstream oss; oss.imbue(loc_es); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it04 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); + + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'a'); wstring result4 = oss.str(); VERIFY( result4 == L"dom" ); oss.str(empty); // "%d/%m/%y" - iterator_type os_it27 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x'); wstring result27 = oss.str(); // "04/04/71" VERIFY( result27 == L"04/04/71" ); oss.str(empty); // "%T" - iterator_type os_it28 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X'); wstring result28 = oss.str(); // "12:00:00" VERIFY( result28 == L"12:00:00" ); oss.str(empty); - iterator_type os_it37 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'x', 'E'); wstring result37 = oss.str(); // "04/04/71" VERIFY( result37 == L"04/04/71" ); oss.str(empty); - iterator_type os_it38 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, 'X', 'E'); wstring result38 = oss.str(); // "12:00:00" VERIFY( result38 == L"12:00:00" ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc index 77f7798abe4..1a355e0a514 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc @@ -1,6 +1,6 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -46,17 +46,17 @@ void test05() const wstring empty; wostringstream oss; oss.imbue(loc_c); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); // 2 oss.str(empty); - iterator_type os_it05 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date, date + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date, date + traits::length(date)); wstring result5 = oss.str(); VERIFY( result5 == L"Sunday, the second of April"); - iterator_type os_it06 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date_ex, - date_ex + traits::length(date_ex)); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date_ex, date_ex + traits::length(date_ex)); wstring result6 = oss.str(); VERIFY( result6 != result5 ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc index 91a68a05c03..dedac7b78fd 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -48,14 +48,15 @@ void test06() const wstring empty; wostringstream oss; oss.imbue(loc_de); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it07 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date, date + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date, date + traits::length(date)); wstring result7 = oss.str(); VERIFY( result7 == L"Sonntag, the second of April"); - iterator_type os_it08 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date_ex, date_ex + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date_ex, date_ex + traits::length(date)); wstring result8 = oss.str(); VERIFY( result8 != result7 ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc index 439d6086ca0..5f0926c88d0 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -48,14 +48,15 @@ void test07() const wstring empty; wostringstream oss; oss.imbue(loc_hk); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it09 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date, date + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date, date + traits::length(date)); wstring result9 = oss.str(); VERIFY( result9 == L"Sunday, the second of April"); - iterator_type os_it10 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date_ex, date_ex + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date_ex, date_ex + traits::length(date)); wstring result10 = oss.str(); VERIFY( result10 != result9 ); } diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc index b073e8b9287..09311f4c2c8 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc @@ -2,7 +2,7 @@ // 2001-09-17 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 // Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free @@ -48,13 +48,15 @@ void test08() const wstring empty; wostringstream oss; oss.imbue(loc_fr); - const time_put<wchar_t>& tim_put = use_facet<time_put<wchar_t> >(oss.getloc()); - iterator_type os_it11 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date, date + traits::length(date)); + const time_put<wchar_t>& tim_put + = use_facet<time_put<wchar_t> >(oss.getloc()); + + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date, date + traits::length(date)); wstring result11 = oss.str(); VERIFY( result11 == L"dimanche, the second of avril"); - iterator_type os_it12 = tim_put.put(oss.rdbuf(), oss, L'*', &time1, - date_ex, date_ex + traits::length(date)); + tim_put.put(oss.rdbuf(), oss, L'*', &time1, + date_ex, date_ex + traits::length(date)); wstring result12 = oss.str(); VERIFY( result12 != result11 ); } |