re PR libstdc++/39405 (std::shared_ptr barfs on incomplete template class that boost...

2009-03-14  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/39405
	* include/std/type_traits (__add_lvalue_reference_helper,
	__add_rvalue_reference_helper): Avoid is_function.
	* testsuite/20_util/shared_ptr/cons/39405.cc: New.
	* testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc: Likewise.

From-SVN: r144867

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e441488fc00e655fa3166f7ef1490917e80fdaf0..ca2e2c10b1d1d6b586ec0e37632876487fb19aea 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR libstdc++/39405
+       * include/std/type_traits (__add_lvalue_reference_helper,
+       __add_rvalue_reference_helper): Avoid is_function.
+       * testsuite/20_util/shared_ptr/cons/39405.cc: New.
+       * testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc: Likewise.
+
 2009-02-09  Johannes Singler  <singler@ira.uka.de>
 
         Backport from mainline:

diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 1f9a2d9f72db56162940083046c53dcb3dd3cd45..64b1f75725c4ad7b9436e86a9eb0b4c46070308e 100644 (file)
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -1,6 +1,6 @@
 // <type_traits> -*- C++ -*-
 
-// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009 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
@@ -107,7 +107,7 @@ namespace std
     { typedef _Tp   type; };
 
   template<typename _Tp,
-          bool = is_object<_Tp>::value || is_function<_Tp>::value,
+          bool = !is_reference<_Tp>::value && !is_void<_Tp>::value,
           bool = is_rvalue_reference<_Tp>::value>
     struct __add_lvalue_reference_helper
     { typedef _Tp   type; };
@@ -127,7 +127,7 @@ namespace std
     { };
 
   template<typename _Tp,
-          bool = is_object<_Tp>::value || is_function<_Tp>::value>
+          bool = !is_reference<_Tp>::value && !is_void<_Tp>::value>
     struct __add_rvalue_reference_helper
     { typedef _Tp   type; };
 

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc
new file mode 100644 (file)
index 0000000..83221e6
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/39405.cc
@@ -0,0 +1,31 @@
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// Copyright (C) 2009 Free Software Foundation
+//
+// 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.
+
+#include <memory>
+
+// libstdc++/39405
+template<typename T>
+  struct foo
+  {
+    std::shared_ptr<foo<T> > m_foo;
+  };
+
+std::shared_ptr<foo<int> > t;

diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc
new file mode 100644 (file)
index 0000000..4641e1b
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/39405.cc
@@ -0,0 +1,30 @@
+// { dg-do compile }
+
+// Copyright (C) 2009 Free Software Foundation
+//
+// 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.
+
+#include <tr1/memory>
+
+// libstdc++/39405
+template<typename T>
+  struct foo
+  {
+    std::tr1::shared_ptr<foo<T> > m_foo;
+  };
+
+std::tr1::shared_ptr<foo<int> > t;