This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] libstdc++/35637


Hi,

tested x86_64-linux, committed to mainline and 4_3-branch.

Paolo.

PS. Let's fix the regression now: eventually, in mainline, we may be able to do better...

//////////////////
2008-03-20  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/35637
	* include/tr1_impl/type_traits (struct __in_array): Add back.
	(is_function): Use it.
	* testsuite/tr1/4_metaprogramming/is_function/35637.cc: New.
Index: include/tr1_impl/type_traits
===================================================================
--- include/tr1_impl/type_traits	(revision 133368)
+++ include/tr1_impl/type_traits	(working copy)
@@ -1,6 +1,6 @@
 // TR1 type_traits -*- C++ -*-
 
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 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
@@ -163,25 +163,29 @@
     : public integral_constant<bool, __is_class(_Tp)>
     { };
 
-  template<typename>
-    struct __is_function_helper
-    : public false_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct __is_function_helper<_Res(_ArgTypes...)>
-    : public true_type { };
-
-  template<typename _Res, typename... _ArgTypes>
-    struct __is_function_helper<_Res(_ArgTypes......)>
-    : public true_type { };
+  template<typename _Tp>
+    struct __in_array
+    : public __sfinae_types
+    {
+    private:
+      template<typename _Up>
+        static __one __test(_Up(*)[1]);
+      template<typename>
+        static __two __test(...);
+    
+    public:
+      static const bool __value = sizeof(__test<_Tp>(0)) == 1;
+    };
 
   template<typename _Tp>
-    struct remove_cv;
+    struct is_abstract;
 
   template<typename _Tp>
     struct is_function
-    : public integral_constant<bool, (__is_function_helper<typename
-				      remove_cv<_Tp>::type>::value)>
+    : public integral_constant<bool, !(__in_array<_Tp>::__value
+				       || is_abstract<_Tp>::value
+				       || is_reference<_Tp>::value
+				       || is_void<_Tp>::value)>
     { };
 
   /// @brief  composite type traits [4.5.2].
Index: testsuite/tr1/4_metaprogramming/is_function/35637.cc
===================================================================
--- testsuite/tr1/4_metaprogramming/is_function/35637.cc	(revision 0)
+++ testsuite/tr1/4_metaprogramming/is_function/35637.cc	(revision 0)
@@ -0,0 +1,35 @@
+// { dg-options "-pedantic-errors" }
+// { dg-do compile }
+
+// Copyright (C) 2008 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 4.5.1 Primary type categories
+
+#include <tr1/functional>
+
+struct S
+{
+  void F() const {}
+};
+
+// libstdc++/35637
+void test01()
+{
+  std::tr1::function<void (S *)> a(&S::F);
+}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]