Merged trunk at revision 161680 into branch.vect256

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/vect256@161681 138bc75d-0d04-0410-961f-82ee72b054a4

23 files changed, 122 insertions, 116 deletions

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 );
 }