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

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / testsuite / 22_locale / collate / hash / wchar_t / 2.cc

diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
index c10c507..493256c 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
@@ -1,11 +1,17 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005, 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,15 +20,11 @@
 // 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.4.1.1 collate members
 
-// { dg-do run }
-// { dg-options "-finput-charset=iso-8859-1" }
-
 #include <locale>
 #include <testsuite_hooks.h>
 
@@ -35,9 +37,9 @@ void test02()
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );