obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

3 files changed, 255 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/1.cc b/libstdc++-v3/testsuite/22_locale/global_templates/1.cc
new file mode 100644
index 000000000..0bed0ce64
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/global_templates/1.cc
@@ -0,0 +1,71 @@
+// 2000-09-11 Benjamin Kosnik <bkoz@redhat.com>
+
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.1.2 locale globals [lib.locale.global.templates]
+
+#include <cwchar> // for mbstate_t
+#include <locale>
+#include <typeinfo>
+#include <testsuite_hooks.h>
+
+typedef std::codecvt<char, char, std::mbstate_t> ccodecvt;
+
+class gnu_codecvt: public ccodecvt { }; 
+
+void test01()
+{
+  using namespace std;
+
+  bool test __attribute__((unused)) = true;
+
+  // construct a locale object with the C facet
+  const locale& 	cloc = locale::classic();
+  // sanity check the constructed locale has the normal facet
+  VERIFY( has_facet<ccodecvt>(cloc) );
+
+  // construct a locale object with the specialized facet.
+  locale                loc(locale::classic(), new gnu_codecvt);
+  // sanity check the constructed locale has the specialized facet.
+  VERIFY( has_facet<gnu_codecvt>(loc) );
+
+  try 
+    { const ccodecvt& cvt01 __attribute__((unused)) = use_facet<ccodecvt>(cloc); }
+  catch(...)
+    { VERIFY( false ); }
+
+  try
+    { const gnu_codecvt& cvt02 __attribute__((unused)) = use_facet<gnu_codecvt>(loc); } 
+  catch(...)
+    { VERIFY( false ); }
+
+  try 
+    { const ccodecvt& cvt03 __attribute__((unused)) = use_facet<gnu_codecvt>(cloc); }
+  catch(bad_cast& obj)
+    { VERIFY( true ); }
+  catch(...)
+    { VERIFY( false ); }
+}
+
+int main ()
+{
+  test01();
+
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc b/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc
new file mode 100644
index 000000000..e0acbf833
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc
@@ -0,0 +1,80 @@
+// Copyright (C) 2007, 2008, 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <string>
+#include <locale>
+#include <testsuite_hooks.h>
+
+// Based on Langer Kreft "Standard C++ IOStreams and Locales" p 316-318
+// PR libstdc++/30127
+// PR libstdc++/34449
+int main()
+{
+  bool test __attribute__((unused)) = true;
+
+  using std::locale;
+  using std::has_facet;
+  using std::use_facet;
+  typedef std::ctype<char> base_facet;
+  typedef std::ctype_byname<char> derived_facet;
+
+  locale loc_c = locale::classic();
+  locale loc_base = loc_c;
+  locale loc_derived(loc_c, new derived_facet("C"));
+
+  // Standard base facet.
+  VERIFY( has_facet<base_facet>(loc_c) );
+  VERIFY( has_facet<base_facet>(loc_base) );
+  VERIFY( has_facet<base_facet>(loc_derived) );
+
+  // Standard derived facet.
+  VERIFY( !has_facet<derived_facet>(loc_c) );
+  VERIFY( !has_facet<derived_facet>(loc_base) );
+  VERIFY( has_facet<derived_facet>(loc_derived) );
+
+
+  // 1
+  try
+    {
+      if (has_facet<derived_facet>(loc_base))
+	{
+	  use_facet<derived_facet>(loc_base).widen('k');
+	  VERIFY( true );
+	}
+    }
+  catch (...)
+    { 
+      // Expect no exception.
+      VERIFY( true );
+    }
+
+  // 2
+  try
+    {
+      if (has_facet<base_facet>(loc_derived))
+	use_facet<base_facet>(loc_derived).widen('k');
+      else
+	VERIFY( true );
+    }
+  catch (...)
+    { 
+      // Expect no exception.
+      VERIFY( true );
+    }
+
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc b/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc
new file mode 100644
index 000000000..dcc039cea
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc
@@ -0,0 +1,104 @@
+// Copyright (C) 2007, 2008, 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 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <string>
+#include <locale>
+#include <testsuite_hooks.h>
+
+// Based on Langer Kreft "Standard C++ IOStreams and Locales" p 316-318
+struct base_facet: public std::locale::facet
+{
+  virtual std::string msg() const
+  { return "base class"; }
+
+  static std::locale::id id;
+};
+
+std::locale::id base_facet::id;
+
+
+struct derived_facet: public base_facet
+{
+  virtual std::string msg() const
+  { return "derived class"; }
+
+  virtual std::string msg_repeater() const
+  { return "derived class derived class"; }
+
+};
+
+// PR libstdc++/30127
+// PR libstdc++/34449
+int main()
+{
+  bool test __attribute__((unused)) = true;
+
+  using std::locale;
+  using std::has_facet;
+  using std::use_facet;
+
+  locale loc_c = locale::classic();
+  locale loc_base(loc_c, new base_facet);
+  locale loc_derived(loc_c, new derived_facet);
+
+  // Standard facets.
+  VERIFY( has_facet<std::ctype<char> >(loc_c) );
+  VERIFY( has_facet<std::ctype<char> >(loc_base) );
+  VERIFY( has_facet<std::ctype<char> >(loc_derived) );
+
+  // User defined base facet.
+  VERIFY( !has_facet<base_facet>(loc_c) );
+  VERIFY( has_facet<base_facet>(loc_base) );
+  VERIFY( has_facet<base_facet>(loc_derived) );
+
+  // User defined derived facet.
+  VERIFY( !has_facet<derived_facet>(loc_c) );
+  VERIFY( !has_facet<derived_facet>(loc_base) );
+  VERIFY( has_facet<derived_facet>(loc_derived) );
+
+
+  // 1
+  try
+    {
+      if (has_facet<derived_facet>(loc_base))
+	{
+	  use_facet<derived_facet>(loc_base).msg_repeater();
+	  VERIFY( false );
+	}
+    }
+  catch (...)
+    { 
+      // Expect no exception.
+      VERIFY( true );
+    }
+
+  // 2
+  try
+    {
+      if (has_facet<base_facet>(loc_derived))
+	use_facet<base_facet>(loc_derived).msg();
+      else
+	VERIFY( true );
+    }
+  catch (...)
+    { 
+      // Expect no exception.
+      VERIFY( true );
+    }
+
+  return 0;
+}