2010-01-01 Paolo Carlini <paolo.carlini@oracle.com>

	Revert last change, reinstantiate basic_string and vstring tests.

From-SVN: r155547

libstdc++-v3/ChangeLog

 2010-01-01  Paolo Carlini  <paolo.carlini@oracle.com>
 
+	Revert last change, reinstantiate basic_string and vstring tests.
+
+2010-01-01  Paolo Carlini  <paolo.carlini@oracle.com>
+
 	* testsuite/21_strings/basic_string/requirements/exception/
 	propagation_consistent.cc: Remove, cannot instantiate basic_string
 	for non-PODs (21/1).

libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc

+// { dg-options "-std=gnu++0x" }
+// { dg-require-cstdint "" }
+
+// 2009-11-10  Benjamin Kosnik  <benjamin@redhat.com>
+
+// Copyright (C) 2009 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
+// 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 <exception/safety.h>
+
+void
+value()
+{
+  typedef __gnu_cxx::throw_value_limit value_type;
+  typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+  typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
+  __gnu_test::basic_safety<test_type> test;
+}
+
+// Container requirement testing, exceptional behavior
+int main()
+{
+  value();
+  return 0;
+}

libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc

+// { dg-options "-std=gnu++0x" }
+// { dg-require-cstdint "" }
+
+// 2009-09-14  Benjamin Kosnik  <benjamin@redhat.com>
+
+// Copyright (C) 2009 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
+// 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 <exception/safety.h>
+
+void
+char_allocator()
+{
+  typedef char value_type;
+  typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+  typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
+  __gnu_test::generation_prohibited<test_type> test;
+}
+
+void
+wchar_allocator()
+{
+  typedef wchar_t value_type;
+  typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+  typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
+  __gnu_test::generation_prohibited<test_type> test;
+}
+
+// Container requirement testing, exceptional behavior
+int main()
+{
+  // throw_allocator
+  char_allocator();
+  wchar_allocator();
+
+  return 0;
+}

libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc

+// { dg-options "-std=gnu++0x" }
+// { dg-require-cstdint "" }
+// { dg-do run { xfail *-*-* } }
+
+// 2009-09-14  Benjamin Kosnik  <benjamin@redhat.com>
+
+// Copyright (C) 2009 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
+// 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 <exception/safety.h>
+
+void
+value()
+{
+  typedef __gnu_cxx::throw_value_limit value_type;
+  typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+  typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
+  __gnu_test::propagation_consistent<test_type> test;
+}
+
+// Container requirement testing, exceptional behavior
+int main()
+{
+  value();
+  return 0;
+}

libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc

+// { dg-options "-std=gnu++0x" }
+// { dg-require-cstdint "" }
+
+// 2009-11-10  Benjamin Kosnik  <benjamin@redhat.com>
+
+// Copyright (C) 2009 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
+// 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 <ext/vstring.h>
+#include <exception/safety.h>
+
+void
+value()
+{
+#if 1
+  typedef char value_type;
+#else
+  // XXX
+  // __gnu_cxx::__rc_string_base<>::_Rep::_M_align’ with constructor
+  // not allowed in union
+  // typedef __gnu_cxx::throw_value_limit value_type;
+#endif
+  typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+
+  typedef __gnu_cxx::__versa_string<value_type, traits_type,
+    allocator_type, __gnu_cxx::__rc_string_base> test_type_rc;
+
+  typedef __gnu_cxx::__versa_string<value_type, traits_type,
+    allocator_type, __gnu_cxx::__sso_string_base> test_type_sso;
+
+  __gnu_test::basic_safety<test_type_rc> test_rc;
+  __gnu_test::basic_safety<test_type_sso> test_sso;
+}
+
+// Container requirement testing, exceptional behavior
+int main()
+{
+  value();
+  return 0;
+}

libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc

+// { dg-options "-std=gnu++0x" }
+// { dg-require-cstdint "" }
+
+// 2009-09-14  Benjamin Kosnik  <benjamin@redhat.com>
+
+// Copyright (C) 2009 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
+// 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 <ext/vstring.h>
+#include <exception/safety.h>
+
+void
+char_instance()
+{
+  typedef char value_type;
+  typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+  typedef __gnu_cxx::__versa_string<value_type, traits_type, allocator_type> test_type;
+  __gnu_test::generation_prohibited<test_type> test;
+}
+
+void
+wchar_instance()
+{
+  typedef wchar_t value_type;
+  typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+  typedef __gnu_cxx::__versa_string<value_type, traits_type, allocator_type> test_type;
+  __gnu_test::generation_prohibited<test_type> test;
+}
+
+// Container requirement testing, exceptional behavior
+int main()
+{
+  char_instance();
+  wchar_instance();
+  return 0;
+}

libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc

+// { dg-options "-std=gnu++0x" }
+// { dg-require-cstdint "" }
+
+// 2009-09-14  Benjamin Kosnik  <benjamin@redhat.com>
+
+// Copyright (C) 2009 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
+// 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 <ext/vstring.h>
+#include <exception/safety.h>
+
+void
+value()
+{
+#if 1
+  typedef char value_type;
+#else
+  // XXX
+  // __gnu_cxx::__rc_string_base<>::_Rep::_M_align’ with constructor
+  // not allowed in union
+  // typedef __gnu_cxx::throw_value_limit value_type;
+#endif
+  typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
+  typedef std::char_traits<value_type> traits_type;
+
+  typedef __gnu_cxx::__versa_string<value_type, traits_type,
+    allocator_type, __gnu_cxx::__rc_string_base> test_type_rc;
+
+  typedef __gnu_cxx::__versa_string<value_type, traits_type,
+    allocator_type, __gnu_cxx::__sso_string_base> test_type_sso;
+
+  __gnu_test::propagation_consistent<test_type_rc> test_rc;
+  __gnu_test::propagation_consistent<test_type_sso> test_sso;
+}
+
+// Container requirement testing, exceptional behavior
+int main()
+{
+  value();
+  return 0;
+}