2004-12-09 Paolo Carlini <pcarlini@suse.de>

	* include/tr1/type_traits: Implement remove_extent and
	remove_all_extents.
	* testsuite/tr1/4_metaprogramming/array_modifications/
	remove_all_extents.cc: New.
	* testsuite/tr1/4_metaprogramming/array_modifications/
	remove_extent.cc: Likewise.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2c285e5..4e510e9 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-09  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/tr1/type_traits: Implement remove_extent and
+       remove_all_extents.
+       * testsuite/tr1/4_metaprogramming/array_modifications/
+       remove_all_extents.cc: New.
+       * testsuite/tr1/4_metaprogramming/array_modifications/
+       remove_extent.cc: Likewise.
+
 2004-12-08  Paolo Carlini  <pcarlini@suse.de>
 
        * include/tr1/type_traits: Implement is_same, add_reference and

diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index 742536c..6b698b0 100644 (file)
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -300,10 +300,40 @@ namespace tr1
 
   /// @brief  array modififications [4.7.3].
   template<typename _Tp>
-    struct remove_extent;
-  
+    struct remove_extent
+    {
+      typedef _Tp   type;
+    };
+
+  template<typename _Tp, std::size_t _Size>
+    struct remove_extent<_Tp[_Size]>
+    {
+      typedef _Tp   type;
+    };
+
+  template<typename _Tp>
+    struct remove_extent<_Tp[]>
+    {
+      typedef _Tp   type;
+    };
+
   template<typename _Tp>
-    struct remove_all_extents;
+    struct remove_all_extents
+    {
+      typedef _Tp   type;
+    };
+
+  template<typename _Tp, std::size_t _Size>
+    struct remove_all_extents<_Tp[_Size]>
+    {
+      typedef typename remove_all_extents<_Tp>::type   type;
+    };
+
+  template<typename _Tp>
+    struct remove_all_extents<_Tp[]>
+    {
+      typedef typename remove_all_extents<_Tp>::type   type;
+    };
 
   /// @brief  pointer modifications [4.7.4].
   template<typename _Tp>

diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_all_extents.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_all_extents.cc
new file mode 100644 (file)
index 0000000..c02a634
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_all_extents.cc
@@ -0,0 +1,54 @@
+// 2004-12-09  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.7.3 Array modifications
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using std::tr1::remove_all_extents;
+  using std::tr1::is_same;
+  using namespace __gnu_test;
+
+  VERIFY( (is_same<remove_all_extents<int>::type, int>::value) );
+  VERIFY( (is_same<remove_all_extents<int[2]>::type, int>::value) );
+  VERIFY( (is_same<remove_all_extents<int[2][3]>::type, int>::value) );
+  VERIFY( (is_same<remove_all_extents<int[][3]>::type, int>::value) );
+  VERIFY( (is_same<remove_all_extents<const int[2][3]>::type,
+          const int>::value) );
+  VERIFY( (is_same<remove_all_extents<ClassType>::type, ClassType>::value) );
+  VERIFY( (is_same<remove_all_extents<ClassType[2]>::type, ClassType>::value) );
+  VERIFY( (is_same<remove_all_extents<ClassType[2][3]>::type,
+          ClassType>::value) );
+  VERIFY( (is_same<remove_all_extents<ClassType[][3]>::type,
+          ClassType>::value) );
+  VERIFY( (is_same<remove_all_extents<const ClassType[2][3]>::type,
+          const ClassType>::value) );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}

diff --git a/libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_extent.cc b/libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_extent.cc
new file mode 100644 (file)
index 0000000..9cd372d
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_extent.cc
@@ -0,0 +1,53 @@
+// 2004-12-09  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.7.3 Array modifications
+
+#include <tr1/type_traits>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using std::tr1::remove_extent;
+  using std::tr1::is_same;
+  using namespace __gnu_test;
+
+  VERIFY( (is_same<remove_extent<int>::type, int>::value) );
+  VERIFY( (is_same<remove_extent<int[2]>::type, int>::value) );
+  VERIFY( (is_same<remove_extent<int[2][3]>::type, int[3]>::value) );
+  VERIFY( (is_same<remove_extent<int[][3]>::type, int[3]>::value) );
+  VERIFY( (is_same<remove_extent<const int[2]>::type, const int>::value) );
+  VERIFY( (is_same<remove_extent<ClassType>::type, ClassType>::value) );
+  VERIFY( (is_same<remove_extent<ClassType[2]>::type, ClassType>::value) );
+  VERIFY( (is_same<remove_extent<ClassType[2][3]>::type,
+          ClassType[3]>::value) );
+  VERIFY( (is_same<remove_extent<ClassType[][3]>::type,
+          ClassType[3]>::value) );
+  VERIFY( (is_same<remove_extent<const ClassType[2]>::type,
+          const ClassType>::value) );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}