From 366e6bd1733bb53b0f555ea4365e9d16f24fa143 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Thu, 9 Dec 2004 17:54:27 +0000
Subject: [PATCH] type_traits: Implement remove_extent and remove_all_extents.
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.
From-SVN: r91958
---
libstdc++-v3/ChangeLog | 9 ++++
libstdc++-v3/include/tr1/type_traits | 36 +++++++++++--
.../array_modifications/remove_all_extents.cc | 54 +++++++++++++++++++
.../array_modifications/remove_extent.cc | 53 ++++++++++++++++++
4 files changed, 149 insertions(+), 3 deletions(-)
create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_all_extents.cc
create mode 100644 libstdc++-v3/testsuite/tr1/4_metaprogramming/array_modifications/remove_extent.cc
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2c285e58aa65..4e510e998342 100644
--- 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 742536cb76a5..6b698b0623a2 100644
--- 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
index 000000000000..c02a63449a64
--- /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
index 000000000000..9cd372da05ef
--- /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;
+}
--
GitLab