diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 65f877d00d0aabb3501aa7a2dab3ce22f1cbc647..c6705aa0c8a04828ac7b3798c2696faa73852db2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-29 Paolo Carlini <pcarlini@suse.de>
+
+ * include/tr1/type_traits: Add has_nothrow_constructor.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ has_nothrow_constructor/has_nothrow_constructor.cc: New.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ has_nothrow_constructor/typedefs.cc: Likewise.
+
2004-12-28 David Edelsohn <edelsohn@gnu.org>
* configure.host (aix4*|aix5*): Add atomic_word_dir.
diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index d035a197b78c4d35724a7db3ee78dd42c29353c0..3cca0202ba5e80b92a5c09a1761f87b1f81b0b05 100644
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -280,6 +280,10 @@ namespace tr1
struct has_trivial_destructor
: public integral_constant<bool, is_pod<_Tp>::value> { };
+ template<typename _Tp>
+ struct has_nothrow_constructor
+ : public integral_constant<bool, is_pod<_Tp>::value> { };
+
template<typename>
struct has_virtual_destructor
: public false_type { };
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/has_nothrow_constructor.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/has_nothrow_constructor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3db624154bb108ff7652c804772bbc0ebde5f6e8
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/has_nothrow_constructor.cc
@@ -0,0 +1,62 @@
+// 2004-12-29 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 4.5.3 Type properties
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using std::tr1::has_nothrow_constructor;
+ using namespace __gnu_test;
+
+ VERIFY( (test_category<has_nothrow_constructor, void>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, int>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, float>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, EnumType>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, int*>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, int(*)(int)>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<has_nothrow_constructor,
+ // int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, int[2]>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, float[][3]>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, int*[3]>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor, int(*[][2])(int)>(true)) );
+ VERIFY( (test_category<has_nothrow_constructor,
+ int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<has_nothrow_constructor,
+ // int (ClassType::*[][2][3]) (int)>(true)) );
+
+ // Sanity check.
+ VERIFY( (test_category<has_nothrow_constructor, ClassType>(false)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/typedefs.cc
new file mode 100644
index 0000000000000000000000000000000000000000..926d0f50fadd921d1f8354a4e531b390ae215be4
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_nothrow_constructor/typedefs.cc
@@ -0,0 +1,36 @@
+// 2004-12-29 Paolo Carlini <pcarlini@suse.de>
+//
+// Copyright (C) 2004 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 2, 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 COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+//
+// NB: This file is for testing tr1/type_traits with NO OTHER INCLUDES.
+
+#include <tr1/type_traits>
+
+// { dg-do compile }
+
+void test01()
+{
+ // Check for required typedefs
+ typedef std::tr1::has_nothrow_constructor<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;
+}