diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fcedb372a7e8202009c26070696476f7d7bfbea7..0484e3403fa9f9e97fb78e6565ae862b7d09b3e1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,20 @@
+2004-12-26 Paolo Carlini <pcarlini@suse.de>
+
+ * include/tr1/type_traits: Implement is_pod, has_trivial_constructor,
+ and has_trivial_destructor.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ has_trivial_constructor/has_trivial_constructor.cc: New.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ has_trivial_constructor/typedefs.cc: Likewise.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ has_trivial_destructor/has_trivial_destructor.cc: Likewise.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ has_trivial_destructor/typedefs.cc: Likewise.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ is_pod/is_pod.cc: Likewise.
+ * testsuite/tr1/4_metaprogramming/type_properties/
+ is_pod/typedefs.cc: Likewise.
+
2004-12-25 Paolo Carlini <pcarlini@suse.de>
* include/tr1/type_traits (is_enum): Minor tweak.
diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index 878084362d83cf199f50e87322558aab39571cd5..0c53c9bb2032e2f74b84bc017c9534f05400f601 100644
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -271,6 +271,21 @@ namespace tr1
struct is_volatile<_Tp volatile>
: public true_type { };
+ template<typename _Tp>
+ struct is_pod
+ : public integral_constant<bool, (is_void<_Tp>::value
+ || is_scalar<typename
+ remove_all_extents<_Tp>::type>::value)>
+ { };
+
+ template<typename _Tp>
+ struct has_trivial_constructor
+ : public integral_constant<bool, is_pod<_Tp>::value> { };
+
+ template<typename _Tp>
+ struct has_trivial_destructor
+ : 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_trivial_constructor/has_trivial_constructor.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/has_trivial_constructor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1de7d1eb96985ad91560d710c379066070e74c1b
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/has_trivial_constructor.cc
@@ -0,0 +1,62 @@
+// 2004-12-26 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_trivial_constructor;
+ using namespace __gnu_test;
+
+ VERIFY( (test_category<has_trivial_constructor, void>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, int>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, float>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, EnumType>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, int*>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, int(*)(int)>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<has_trivial_constructor,
+ // int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, int[2]>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, float[][3]>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, int*[3]>(true)) );
+ VERIFY( (test_category<has_trivial_constructor, int(*[][2])(int)>(true)) );
+ VERIFY( (test_category<has_trivial_constructor,
+ int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<has_trivial_constructor,
+ // int (ClassType::*[][2][3]) (int)>(true)) );
+
+ // Sanity check.
+ VERIFY( (test_category<has_trivial_constructor, ClassType>(false)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/typedefs.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ef15f5be296908106ff3536194780f8914c12571
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_constructor/typedefs.cc
@@ -0,0 +1,36 @@
+// 2004-12-26 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_trivial_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;
+}
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/has_trivial_destructor.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/has_trivial_destructor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4e4a2842fb12b662a42794a8a359a6a553a673cf
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/has_trivial_destructor.cc
@@ -0,0 +1,62 @@
+// 2004-12-26 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_trivial_destructor;
+ using namespace __gnu_test;
+
+ VERIFY( (test_category<has_trivial_destructor, void>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, int>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, float>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, EnumType>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, int*>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, int(*)(int)>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<has_trivial_destructor,
+ // int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, int[2]>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, float[][3]>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, int*[3]>(true)) );
+ VERIFY( (test_category<has_trivial_destructor, int(*[][2])(int)>(true)) );
+ VERIFY( (test_category<has_trivial_destructor,
+ int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<has_trivial_destructor,
+ // int (ClassType::*[][2][3]) (int)>(true)) );
+
+ // Sanity check.
+ VERIFY( (test_category<has_trivial_destructor, ClassType>(false)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/typedefs.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1ba4e6f75f996ad7c00bfc5422521be20d5a055c
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/has_trivial_destructor/typedefs.cc
@@ -0,0 +1,36 @@
+// 2004-12-26 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_trivial_destructor<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/tr1/4_metaprogramming/type_properties/is_pod/is_pod.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/is_pod.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4fac0f3cb0e33679160634f10a6b48e45b73c25a
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/is_pod.cc
@@ -0,0 +1,59 @@
+// 2004-12-26 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::is_pod;
+ using namespace __gnu_test;
+
+ VERIFY( (test_category<is_pod, void>(true)) );
+ VERIFY( (test_category<is_pod, int>(true)) );
+ VERIFY( (test_category<is_pod, float>(true)) );
+ VERIFY( (test_category<is_pod, EnumType>(true)) );
+ VERIFY( (test_category<is_pod, int*>(true)) );
+ VERIFY( (test_category<is_pod, int(*)(int)>(true)) );
+ VERIFY( (test_category<is_pod, int (ClassType::*)>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<is_pod, int (ClassType::*) (int)>(true)) );
+ VERIFY( (test_category<is_pod, int[2]>(true)) );
+ VERIFY( (test_category<is_pod, float[][3]>(true)) );
+ VERIFY( (test_category<is_pod, EnumType[2][3][4]>(true)) );
+ VERIFY( (test_category<is_pod, int*[3]>(true)) );
+ VERIFY( (test_category<is_pod, int(*[][2])(int)>(true)) );
+ VERIFY( (test_category<is_pod, int (ClassType::*[2][3])>(true)) );
+ // Temporarily disabled because of c++/19076 :-(
+ // VERIFY( (test_category<is_pod, int (ClassType::*[][2][3]) (int)>(true)) );
+
+ // Sanity check.
+ VERIFY( (test_category<is_pod, ClassType>(false)) );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/typedefs.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/typedefs.cc
new file mode 100644
index 0000000000000000000000000000000000000000..db563d56e104c047a17dd9865369a52b44b9f047
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/type_properties/is_pod/typedefs.cc
@@ -0,0 +1,36 @@
+// 2004-12-26 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::is_pod<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;
+}