From 60ed593590618b549860d3bfc224f6ee85467073 Mon Sep 17 00:00:00 2001 From: paolo Date: Tue, 10 Aug 2010 16:54:09 +0000 Subject: 2010-08-10 Paolo Carlini * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163075 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/include/bits/shared_ptr_base.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libstdc++-v3/include/bits/shared_ptr_base.h') diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index b9b0ed94b54..802d1b5b70e 100644 --- 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::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::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::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 __weak_ptr& -- cgit v1.2.1