Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / testsuite / 22_locale / time_get / get_year / char / 1.cc

diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
index 62f393b..c6fb3dd 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc
@@ -1,11 +1,12 @@
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009
+// Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -14,9 +15,8 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
 
 // 22.2.5.1.1 time_get members
 
@@ -27,26 +27,12 @@
 void test01()
 {
   using namespace std;
-  typedef time_base::dateorder dateorder;
-  typedef istreambuf_iterator<char> iterator_type;
+  bool test __attribute__((unused)) = true;
 
-  bool test = true;
+  typedef istreambuf_iterator<char> iterator_type;
 
-  // basic construction and sanity checks.
+  // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk("en_HK");
-  locale loc_fr("fr_FR@euro");
-  locale loc_de("de_DE");
-  VERIFY( loc_hk != loc_c );
-  VERIFY( loc_hk != loc_fr );
-  VERIFY( loc_hk != loc_de );
-  VERIFY( loc_de != loc_fr );
-
-  // cache the __timepunct facets, for quicker gdb inspection
-  const __timepunct<char>& time_c = use_facet<__timepunct<char> >(loc_c); 
-  const __timepunct<char>& time_de = use_facet<__timepunct<char> >(loc_de); 
-  const __timepunct<char>& time_hk = use_facet<__timepunct<char> >(loc_hk); 
-  const __timepunct<char>& time_fr = use_facet<__timepunct<char> >(loc_fr); 
 
   const string empty;
 
@@ -61,11 +47,7 @@ void test01()
   ios_base::iostate errorstate = good;
 
   // create "C" time objects
-  const tm time_bday = { 0, 0, 12, 4, 3, 71 };
-  const char* all = "%a %A %b %B %c %d %H %I %j %m %M %p %s %U "
-                    "%w %W %x %X %y %Y %Z %%";
-  const char* date = "%A, the second of %B";
-  const char* date_ex = "%Ex";
+  const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0);
 
   // iter_type 
   // get_year(iter_type, iter_type, ios_base&, ios_base::iostate&, tm*) const
@@ -83,29 +65,32 @@ void test01()
   iterator_type is_it02(iss);
   tm time02;
   errorstate = good;
-  tim_get.get_year(is_it02, end, iss, errorstate, &time02);
+  iterator_type ret02 = tim_get.get_year(is_it02, end, iss, errorstate,
+                                        &time02);
   VERIFY( time02.tm_year == time_bday.tm_year );
   VERIFY( errorstate == good );
-  VERIFY( *is_it02 == ' ');
+  VERIFY( *ret02 == ' ' );
 
   iss.str("197d1 ");
   iterator_type is_it03(iss);
   tm time03;
   time03.tm_year = 3;
   errorstate = good;
-  tim_get.get_year(is_it03, end, iss, errorstate, &time03);
+  iterator_type ret03 = tim_get.get_year(is_it03, end, iss, errorstate,
+                                        &time03);
   VERIFY( time03.tm_year == 3 );
   VERIFY( errorstate == ios_base::failbit );
-  VERIFY( *is_it03 == 'd');
+  VERIFY( *ret03 == 'd' );
 
   iss.str("71d71");
   iterator_type is_it04(iss);
   tm time04;
   errorstate = good;
-  tim_get.get_year(is_it04, end, iss, errorstate, &time04);
+  iterator_type ret04 = tim_get.get_year(is_it04, end, iss, errorstate,
+                                        &time04);
   VERIFY( time04.tm_year == time_bday.tm_year );
   VERIFY( errorstate == good );
-  VERIFY( *is_it03 == 'd');
+  VERIFY( *ret04 == 'd' );
 
   iss.str("71");
   iterator_type is_it05(iss);