shared_ptr_base.h: Remove a few now redundant __glibcxx_function_requires(_Convertibl...

2010-08-10  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/shared_ptr_base.h: Remove a few now redundant
	__glibcxx_function_requires(_ConvertibleConcept...).
	* testsuite/20_util/shared_ptr/cons/43820.cc: Adjust dg-error
	line number.
	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.

From-SVN: r163075

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dc7b244aabad0d6f871fd59d424e74197e084a9c..e23edfc4518e12cbc5eebeb22c41261b38d5aa58 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/bits/shared_ptr_base.h: Remove a few now redundant
+       __glibcxx_function_requires(_ConvertibleConcept...).
+       * testsuite/20_util/shared_ptr/cons/43820.cc: Adjust dg-error
+       line number.
+       * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
+
 2010-08-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * testsuite/ext/stdio_sync_filebuf/char/1.cc: Avoid -Wall

diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
index b9b0ed94b5446f3bf18a3783e9b665adb573b87c..802d1b5b70eeac3fbe7f427a8f24bb92bf89cbcd 100644 (file)
--- a/libstdc++-v3/include/bits/shared_ptr_base.h
+++ b/libstdc++-v3/include/bits/shared_ptr_base.h
@@ -605,7 +605,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
               std::enable_if<std::is_convertible<_Tp1*, _Tp*>::value>::type>
        __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r)
        : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws
-       { __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>) }
+       { }
 
       __shared_ptr(__shared_ptr&& __r)
       : _M_ptr(__r._M_ptr), _M_refcount() // never throws
@@ -619,7 +619,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        __shared_ptr(__shared_ptr<_Tp1, _Lp>&& __r)
        : _M_ptr(__r._M_ptr), _M_refcount() // never throws
        {
-         __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
          _M_refcount._M_swap(__r._M_refcount);
          __r._M_ptr = 0;
        }
@@ -971,16 +970,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
               std::enable_if<std::is_convertible<_Tp1*, _Tp*>::value>::type>
        __weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r)
        : _M_refcount(__r._M_refcount) // never throws
-       {
-         __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>)
-         _M_ptr = __r.lock().get();
-       }
+        { _M_ptr = __r.lock().get(); }
 
       template<typename _Tp1, typename = typename
               std::enable_if<std::is_convertible<_Tp1*, _Tp*>::value>::type>
        __weak_ptr(const __shared_ptr<_Tp1, _Lp>& __r)
        : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) // never throws
-       { __glibcxx_function_requires(_ConvertibleConcept<_Tp1*, _Tp*>) }
+       { }
 
       template<typename _Tp1>
        __weak_ptr&

diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc
index 81d3a0f22bfe175cd21fd6ad6dca17c17307d490..adc005d0c501eb6f0ede4622bb4be99695d73145 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc
@@ -35,6 +35,6 @@ void test01()
   // { dg-error "incomplete" "" { target *-*-* } 566 }
 
   std::shared_ptr<X> p9(ap());  // { dg-error "here" }
-  // { dg-error "incomplete" "" { target *-*-* } 659 }
+  // { dg-error "incomplete" "" { target *-*-* } 658 }
 
 }

diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
index 2635a332ff7a30833e4d50ce1abc11dfbe1c4be4..ea84c7e82a9f2fb4393eb3fa24ff33180cd9fce6 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
@@ -43,7 +43,7 @@ main()
 
 // { dg-warning "note" "" { target *-*-* } 327 }
 // { dg-warning "note" "" { target *-*-* } 446 }
-// { dg-warning "note" "" { target *-*-* } 864 }
+// { dg-warning "note" "" { target *-*-* } 863 }
 // { dg-warning "note" "" { target *-*-* } 580 }
 // { dg-warning "note" "" { target *-*-* } 1027 }
 // { dg-warning "note" "" { target *-*-* } 340 }