Index: include/std/type_traits
===================================================================
--- include/std/type_traits	(revision 160437)
+++ include/std/type_traits	(working copy)
@@ -246,9 +246,9 @@
     : 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 @@
     : 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)>
     { };
 
Index: testsuite/20_util/has_nothrow_copy_assign/value.cc
===================================================================
--- testsuite/20_util/has_nothrow_copy_assign/value.cc	(revision 0)
+++ testsuite/20_util/has_nothrow_copy_assign/value.cc	(revision 0)
@@ -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;
+}
Index: testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc
===================================================================
--- testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc	(revision 0)
+++ testsuite/20_util/has_nothrow_copy_assign/requirements/typedefs.cc	(revision 0)
@@ -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;
+}
Index: testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc	(revision 0)
+++ testsuite/20_util/has_nothrow_copy_assign/requirements/explicit_instantiation.cc	(revision 0)
@@ -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>;
+}
Index: testsuite/20_util/has_trivial_copy_assign/value.cc
===================================================================
--- testsuite/20_util/has_trivial_copy_assign/value.cc	(revision 0)
+++ testsuite/20_util/has_trivial_copy_assign/value.cc	(revision 0)
@@ -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;
+}
Index: testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc
===================================================================
--- testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc	(revision 0)
+++ testsuite/20_util/has_trivial_copy_assign/requirements/typedefs.cc	(revision 0)
@@ -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;
+}
Index: testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc	(revision 0)
+++ testsuite/20_util/has_trivial_copy_assign/requirements/explicit_instantiation.cc	(revision 0)
@@ -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>;
+}
