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

	* include/std/type_traits (has_nothrow_assign): Rename to
	has_nothrow_copy_assign.
	(has_trivial_assign): Rename to has_trivial_copy_assign.
	* testsuite/20_util/has_nothrow_copy_assign/value.cc: New.
	* testsuite/20_util/has_nothrow_copy_assign/requirements/
	typedefs.cc: Likewise.
	* testsuite/20_util/has_nothrow_copy_assign/requirements/
	explicit_instantiation.cc: Likewise.
	* testsuite/20_util/has_trivial_copy_assign/value.cc: Likewise.
	* testsuite/20_util/has_trivial_copy_assign/requirements/
	typedefs.cc: Likewise.
	* testsuite/20_util/has_trivial_copy_assign/requirements/
	explicit_instantiation.cc: Likewise.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index aa2e5bd..db2c206 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,19 @@
+2010-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/std/type_traits (has_nothrow_assign): Rename to
+       has_nothrow_copy_assign.
+       (has_trivial_assign): Rename to has_trivial_copy_assign.
+       * testsuite/20_util/has_nothrow_copy_assign/value.cc: New.
+       * testsuite/20_util/has_nothrow_copy_assign/requirements/
+       typedefs.cc: Likewise.
+       * testsuite/20_util/has_nothrow_copy_assign/requirements/
+       explicit_instantiation.cc: Likewise.
+       * testsuite/20_util/has_trivial_copy_assign/value.cc: Likewise.
+       * testsuite/20_util/has_trivial_copy_assign/requirements/
+       typedefs.cc: Likewise.
+       * testsuite/20_util/has_trivial_copy_assign/requirements/
+       explicit_instantiation.cc: Likewise.
+
 2010-06-08  Johannes Singler  <singler@kit.edu>
 
         * include/parallel/find.h

diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 3253f41..ba9d62c 100644 (file)
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -246,9 +246,9 @@ namespace std
     : public integral_constant<bool, __has_trivial_copy(_Tp)>
     { };
 
-  /// has_trivial_assign
+  /// has_trivial_copy_assign
   template<typename _Tp>
-    struct has_trivial_assign
+    struct has_trivial_copy_assign
     : public integral_constant<bool, __has_trivial_assign(_Tp)>
     { };
 
@@ -270,9 +270,9 @@ namespace std
     : public integral_constant<bool, __has_nothrow_copy(_Tp)>
     { };
 
-  /// has_nothrow_assign
+  /// has_nothrow_copy_assign
   template<typename _Tp>
-    struct has_nothrow_assign
+    struct has_nothrow_copy_assign
     : public integral_constant<bool, __has_nothrow_assign(_Tp)>
     { };
 

diff --git a/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc
new file mode 100644 (file)
index 0000000..0a4a622
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc
@@ -0,0 +1,30 @@
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+// 2010-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 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/>.
+
+// NB: This file is for testing type_traits with NO OTHER INCLUDES.
+
+#include <type_traits>
+
+namespace std
+{
+  typedef short test_type;
+  template struct has_nothrow_copy_assign<test_type>;
+}

diff --git a/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc
new file mode 100644 (file)
index 0000000..3781d1f
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc
@@ -0,0 +1,36 @@
+// { dg-options "-std=gnu++0x" }
+// 2010-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 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/>.
+
+// 
+// NB: This file is for testing type_traits with NO OTHER INCLUDES.
+
+#include <type_traits>
+
+// { dg-do compile }
+
+void test01()
+{
+  // Check for required typedefs
+  typedef std::has_nothrow_copy_assign<int>   test_type;
+  typedef test_type::value_type               value_type;
+  typedef test_type::type                     type;
+  typedef test_type::type::value_type         type_value_type;
+  typedef test_type::type::type               type_type;
+}

diff --git a/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/value.cc b/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/value.cc
new file mode 100644 (file)
index 0000000..0201c9c
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/has_nothrow_copy_assign/value.cc
@@ -0,0 +1,57 @@
+// { dg-options "-std=gnu++0x" }
+// 2010-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 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 <type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using std::has_nothrow_copy_assign;
+  using namespace __gnu_test;
+
+  VERIFY( (test_property<has_nothrow_copy_assign, int>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, float>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, EnumType>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, int*>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, int(*)(int)>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, int (ClassType::*)>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign,
+          int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, int[2]>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, float[][3]>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, EnumType[2][3][4]>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, int*[3]>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, int(*[][2])(int)>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign,
+          int (ClassType::*[2][3])>(true)) );
+  VERIFY( (test_property<has_nothrow_copy_assign, 
+          int (ClassType::*[][2][3]) (int)>(true)) );
+
+  // Negative tests.
+  VERIFY( (test_property<has_nothrow_copy_assign, void>(false)) );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}

diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc
new file mode 100644 (file)
index 0000000..6ec5c5a
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc
@@ -0,0 +1,30 @@
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+// 2010-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 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/>.
+
+// NB: This file is for testing type_traits with NO OTHER INCLUDES.
+
+#include <type_traits>
+
+namespace std
+{
+  typedef short test_type;
+  template struct has_trivial_copy_assign<test_type>;
+}

diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc
new file mode 100644 (file)
index 0000000..1c5f0fe
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc
@@ -0,0 +1,36 @@
+// { dg-options "-std=gnu++0x" }
+// 2010-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 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/>.
+
+// 
+// NB: This file is for testing type_traits with NO OTHER INCLUDES.
+
+#include <type_traits>
+
+// { dg-do compile }
+
+void test01()
+{
+  // Check for required typedefs
+  typedef std::has_trivial_copy_assign<int>   test_type;
+  typedef test_type::value_type               value_type;
+  typedef test_type::type                     type;
+  typedef test_type::type::value_type         type_value_type;
+  typedef test_type::type::type               type_type;
+}

diff --git a/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/value.cc b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/value.cc
new file mode 100644 (file)
index 0000000..7663a68
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/has_trivial_copy_assign/value.cc
@@ -0,0 +1,57 @@
+// { dg-options "-std=gnu++0x" }
+// 2010-06-08  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 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 <type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using std::has_trivial_copy_assign;
+  using namespace __gnu_test;
+
+  VERIFY( (test_property<has_trivial_copy_assign, int>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, float>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, EnumType>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, int*>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, int(*)(int)>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, int (ClassType::*)>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign,
+          int (ClassType::*) (int)>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, int[2]>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, float[][3]>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, EnumType[2][3][4]>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, int*[3]>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign, int(*[][2])(int)>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign,
+          int (ClassType::*[2][3])>(true)) );
+  VERIFY( (test_property<has_trivial_copy_assign,
+          int (ClassType::*[][2][3]) (int)>(true)) );
+
+  // Negative tests.
+  VERIFY( (test_property<has_trivial_copy_assign, void>(false)) );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}