Skip to content

R
riscv-gcc-1
Commit aca12aff by Jonathan Wakely Committed by Jonathan Wakely
Options

Fix dejagnu directives in shared_ptr test 

	PR libstdc++/68825
	* include/experimental/bits/shared_ptr.h (__shared_ptr, __weak_ptr,
	experimental::shared_ptr, experimental::weak_ptr): Constrain
	assignment operators.
	* testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc:
	Change to a compile-only test and change dg-excess-errors to dg-error.

From-SVN: r231516
parent 102a1631
Showing with 44 additions and 45 deletions
libstdc++-v3/ChangeLog
2015-12-10 Jonathan Wakely <jwakely@redhat.com> 2015-12-10 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/68825
* include/experimental/bits/shared_ptr.h (__shared_ptr, __weak_ptr,
experimental::shared_ptr, experimental::weak_ptr): Constrain
assignment operators.
* testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc:
Change to a compile-only test and change dg-excess-errors to dg-error.
* doc/doxygen/user.cfg.in: Use EXTENSION_MAPPING tag. Add new headers * doc/doxygen/user.cfg.in: Use EXTENSION_MAPPING tag. Add new headers
to INPUT. Remove obsolete XML_SCHEMA and XML_DTD tags. Update to INPUT. Remove obsolete XML_SCHEMA and XML_DTD tags. Update
PREDEFINED macros. Set BRIEF_MEMBER_DESC for man-pages. PREDEFINED macros. Set BRIEF_MEMBER_DESC for man-pages.
......
libstdc++-v3/include/experimental/bits/shared_ptr.h
...@@ -91,9 +91,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -91,9 +91,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
class __shared_ptr<__libfund_v1<_Tp, false>, _Lp> class __shared_ptr<__libfund_v1<_Tp, false>, _Lp>
: private __shared_ptr<_Tp, _Lp> : private __shared_ptr<_Tp, _Lp>
{ {
template<typename _Tp1> template<typename _Tp1, typename _Res = void>
using _Compatible using _Compatible
= enable_if_t<__sp_compatible<_Tp1, _Tp>::value>; = enable_if_t<__sp_compatible<_Tp1, _Tp>::value, _Res>;
using _Base_type = __shared_ptr<_Tp>; using _Base_type = __shared_ptr<_Tp>;
...@@ -201,7 +201,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -201,7 +201,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
using _Base_type::operator->; using _Base_type::operator->;
template<typename _Tp1> template<typename _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(const __shared_ptr<__libfund_v1<_Tp1>, _Lp>& __r) noexcept operator=(const __shared_ptr<__libfund_v1<_Tp1>, _Lp>& __r) noexcept
{ {
_Base_type::operator=(__r._M_get_base()); _Base_type::operator=(__r._M_get_base());
...@@ -209,7 +209,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -209,7 +209,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<class _Tp1> template<class _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(__shared_ptr<__libfund_v1<_Tp1>, _Lp>&& __r) noexcept operator=(__shared_ptr<__libfund_v1<_Tp1>, _Lp>&& __r) noexcept
{ {
_Base_type::operator=(std::move(__r._M_get_base())); _Base_type::operator=(std::move(__r._M_get_base()));
...@@ -217,7 +217,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -217,7 +217,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename _Tp1> template<typename _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(std::unique_ptr<_Tp1>&& __r) operator=(std::unique_ptr<_Tp1>&& __r)
{ {
_Base_type::operator=(std::move(__r)); _Base_type::operator=(std::move(__r));
...@@ -226,7 +226,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -226,7 +226,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if _GLIBCXX_USE_DEPRECATED #if _GLIBCXX_USE_DEPRECATED
template<typename _Tp1> template<typename _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(std::auto_ptr<_Tp1>&& __r) operator=(std::auto_ptr<_Tp1>&& __r)
{ {
_Base_type::operator=(std::move(__r)); _Base_type::operator=(std::move(__r));
...@@ -292,26 +292,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -292,26 +292,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
using element_type = remove_extent_t<_Tp>; using element_type = remove_extent_t<_Tp>;
private: private:
struct _Array_Deleter struct _Array_deleter
{ {
void void
operator()(element_type const *__p) const operator()(element_type const *__p) const
{ delete [] __p; } { delete [] __p; }
}; };
struct _Normal_Deleter template<typename _Tp1, typename _Res = void>
{
void
operator()(element_type const *__p) const
{ delete __p; }
};
template<typename _Tp1>
using _Compatible using _Compatible
= enable_if_t<__sp_compatible<_Tp1, _Tp>::value>; = enable_if_t<__sp_compatible<_Tp1, _Tp>::value, _Res>;
using _Deleter_type
= conditional_t<is_array<_Tp>::value, _Array_Deleter, _Normal_Deleter>;
using _Base_type = __shared_ptr<element_type>; using _Base_type = __shared_ptr<element_type>;
...@@ -325,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -325,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp1> template<typename _Tp1>
explicit __shared_ptr(_Tp1* __p) explicit __shared_ptr(_Tp1* __p)
: _Base_type(__p, _Deleter_type()) : _Base_type(__p, _Array_deleter())
{ } { }
template<typename _Tp1, typename _Deleter> template<typename _Tp1, typename _Deleter>
...@@ -402,7 +392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -402,7 +392,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
reset(_Tp1* __p) reset(_Tp1* __p)
{ {
_GLIBCXX_DEBUG_ASSERT(__p == 0 || __p != get()); _GLIBCXX_DEBUG_ASSERT(__p == 0 || __p != get());
__shared_ptr(__p, _Deleter_type()).swap(*this); __shared_ptr(__p, _Array_deleter()).swap(*this);
} }
template<typename _Tp1, typename _Deleter> template<typename _Tp1, typename _Deleter>
...@@ -423,7 +413,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -423,7 +413,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename _Tp1> template<typename _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(const __shared_ptr<__libfund_v1<_Tp1>, _Lp>& __r) noexcept operator=(const __shared_ptr<__libfund_v1<_Tp1>, _Lp>& __r) noexcept
{ {
_Base_type::operator=(__r._M_get_base()); _Base_type::operator=(__r._M_get_base());
...@@ -431,7 +421,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -431,7 +421,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<class _Tp1> template<class _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(__shared_ptr<__libfund_v1<_Tp1>, _Lp>&& __r) noexcept operator=(__shared_ptr<__libfund_v1<_Tp1>, _Lp>&& __r) noexcept
{ {
_Base_type::operator=(std::move(__r._M_get_base())); _Base_type::operator=(std::move(__r._M_get_base()));
...@@ -439,7 +429,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -439,7 +429,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename _Tp1> template<typename _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(std::unique_ptr<_Tp1>&& __r) operator=(std::unique_ptr<_Tp1>&& __r)
{ {
_Base_type::operator=(std::move(__r)); _Base_type::operator=(std::move(__r));
...@@ -448,7 +438,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -448,7 +438,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if _GLIBCXX_USE_DEPRECATED #if _GLIBCXX_USE_DEPRECATED
template<typename _Tp1> template<typename _Tp1>
__shared_ptr& _Compatible<_Tp1, __shared_ptr&>
operator=(std::auto_ptr<_Tp1>&& __r) operator=(std::auto_ptr<_Tp1>&& __r)
{ {
_Base_type::operator=(std::move(__r)); _Base_type::operator=(std::move(__r));
...@@ -509,8 +499,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -509,8 +499,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
class __weak_ptr<__libfund_v1<_Tp>, _Lp> class __weak_ptr<__libfund_v1<_Tp>, _Lp>
: __weak_ptr<remove_extent_t<_Tp>, _Lp> : __weak_ptr<remove_extent_t<_Tp>, _Lp>
{ {
template<typename _Tp1> template<typename _Tp1, typename _Res = void>
using _Compatible = enable_if_t<__sp_compatible<_Tp1, _Tp>::value>; using _Compatible
= enable_if_t<__sp_compatible<_Tp1, _Tp>::value, _Res>;
using _Base_type = __weak_ptr<remove_extent_t<_Tp>>; using _Base_type = __weak_ptr<remove_extent_t<_Tp>>;
...@@ -551,7 +542,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -551,7 +542,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator=(const __weak_ptr& __r) noexcept = default; operator=(const __weak_ptr& __r) noexcept = default;
template<typename _Tp1> template<typename _Tp1>
__weak_ptr& _Compatible<_Tp1, __weak_ptr&>
operator=(const __weak_ptr<__libfund_v1<_Tp1>, _Lp>& __r) noexcept operator=(const __weak_ptr<__libfund_v1<_Tp1>, _Lp>& __r) noexcept
{ {
this->_Base_type::operator=(__r._M_get_base()); this->_Base_type::operator=(__r._M_get_base());
...@@ -559,7 +550,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -559,7 +550,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename _Tp1> template<typename _Tp1>
__weak_ptr& _Compatible<_Tp1, __weak_ptr&>
operator=(const __shared_ptr<_Tp1, _Lp>& __r) noexcept operator=(const __shared_ptr<_Tp1, _Lp>& __r) noexcept
{ {
this->_Base_type::operator=(__r._M_get_base()); this->_Base_type::operator=(__r._M_get_base());
...@@ -574,7 +565,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -574,7 +565,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename _Tp1> template<typename _Tp1>
__weak_ptr& _Compatible<_Tp1, __weak_ptr&>
operator=(__weak_ptr<_Tp1, _Lp>&& __r) noexcept operator=(__weak_ptr<_Tp1, _Lp>&& __r) noexcept
{ {
this->_Base_type::operator=(std::move(__r._M_get_base())); this->_Base_type::operator=(std::move(__r._M_get_base()));
...@@ -639,8 +630,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -639,8 +630,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp> template<typename _Tp>
class shared_ptr : public __shared_ptr<_Tp> class shared_ptr : public __shared_ptr<_Tp>
{ {
template<typename _Tp1> template<typename _Tp1, typename _Res = void>
using _Compatible = enable_if_t<__sp_compatible<_Tp1, _Tp>::value>; using _Compatible
= enable_if_t<__sp_compatible<_Tp1, _Tp>::value, _Res>;
using _Base_type = __shared_ptr<_Tp>; using _Base_type = __shared_ptr<_Tp>;
...@@ -713,7 +705,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -713,7 +705,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
shared_ptr& operator=(const shared_ptr&) noexcept = default; shared_ptr& operator=(const shared_ptr&) noexcept = default;
template <typename _Tp1> template <typename _Tp1>
shared_ptr& _Compatible<_Tp1, shared_ptr&>
operator=(const shared_ptr<_Tp1>& __r) noexcept operator=(const shared_ptr<_Tp1>& __r) noexcept
{ {
_Base_type::operator=(__r); _Base_type::operator=(__r);
...@@ -728,7 +720,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -728,7 +720,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template <typename _Tp1> template <typename _Tp1>
shared_ptr& _Compatible<_Tp1, shared_ptr&>
operator=(shared_ptr<_Tp1>&& __r) noexcept operator=(shared_ptr<_Tp1>&& __r) noexcept
{ {
_Base_type::operator=(std::move(__r)); _Base_type::operator=(std::move(__r));
...@@ -737,7 +729,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -737,7 +729,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if _GLIBCXX_USE_DEPRECATED #if _GLIBCXX_USE_DEPRECATED
template<typename _Tp1> template<typename _Tp1>
shared_ptr& _Compatible<_Tp1, shared_ptr&>
operator=(std::auto_ptr<_Tp1>&& __r) operator=(std::auto_ptr<_Tp1>&& __r)
{ {
__shared_ptr<_Tp>::operator=(std::move(__r)); __shared_ptr<_Tp>::operator=(std::move(__r));
...@@ -746,7 +738,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -746,7 +738,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif #endif
template <typename _Tp1, typename _Del> template <typename _Tp1, typename _Del>
shared_ptr& _Compatible<_Tp1, shared_ptr&>
operator=(unique_ptr<_Tp1, _Del>&& __r) operator=(unique_ptr<_Tp1, _Del>&& __r)
{ {
_Base_type::operator=(std::move(__r)); _Base_type::operator=(std::move(__r));
...@@ -933,8 +925,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -933,8 +925,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp> template<typename _Tp>
class weak_ptr : public __weak_ptr<_Tp> class weak_ptr : public __weak_ptr<_Tp>
{ {
template<typename _Tp1> template<typename _Tp1, typename _Res = void>
using _Compatible = enable_if_t<__sp_compatible<_Tp1, _Tp>::value>; using _Compatible
= enable_if_t<__sp_compatible<_Tp1, _Tp>::value, _Res>;
using _Base_type = __weak_ptr<_Tp>; using _Base_type = __weak_ptr<_Tp>;
...@@ -961,7 +954,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -961,7 +954,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator=(const weak_ptr& __r) noexcept = default; operator=(const weak_ptr& __r) noexcept = default;
template<typename _Tp1> template<typename _Tp1>
weak_ptr& _Compatible<_Tp1, weak_ptr&>
operator=(const weak_ptr<_Tp1>& __r) noexcept operator=(const weak_ptr<_Tp1>& __r) noexcept
{ {
this->_Base_type::operator=(__r); this->_Base_type::operator=(__r);
...@@ -969,7 +962,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -969,7 +962,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
template<typename _Tp1> template<typename _Tp1>
weak_ptr& _Compatible<_Tp1, weak_ptr&>
operator=(const shared_ptr<_Tp1>& __r) noexcept operator=(const shared_ptr<_Tp1>& __r) noexcept
{ {
this->_Base_type::operator=(__r); this->_Base_type::operator=(__r);
...@@ -980,7 +973,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -980,7 +973,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator=(weak_ptr&& __r) noexcept = default; operator=(weak_ptr&& __r) noexcept = default;
template<typename _Tp1> template<typename _Tp1>
weak_ptr& _Compatible<_Tp1, weak_ptr&>
operator=(weak_ptr<_Tp1>&& __r) noexcept operator=(weak_ptr<_Tp1>&& __r) noexcept
{ {
this->_Base_type::operator=(std::move(__r)); this->_Base_type::operator=(std::move(__r));
......
libstdc++-v3/testsuite/experimental/memory/shared_ptr/cons/copy_ctor_neg.cc
// { dg-options "-std=gnu++1y" } // { dg-options "-std=gnu++1y" }
// { dg-do compile }
// Copyright (C) 2015 Free Software Foundation, Inc. // Copyright (C) 2015 Free Software Foundation, Inc.
// //
...@@ -19,11 +20,9 @@ ...@@ -19,11 +20,9 @@
// 8.2.1 Class template shared_ptr [memory.smartptr.shared] // 8.2.1 Class template shared_ptr [memory.smartptr.shared]
#include <experimental/memory> #include <experimental/memory>
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
struct A { virtual ~A() { } }; struct A { virtual ~A() { } };
struct B : A { }; struct B : A { };
...@@ -38,7 +37,7 @@ test01() ...@@ -38,7 +37,7 @@ test01()
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
std::experimental::shared_ptr<A[3]> a; std::experimental::shared_ptr<A[3]> a;
a = std::experimental::shared_ptr<B[3]> (new B[3]); // { dg-excess-errors "no matching" } a = std::experimental::shared_ptr<B[3]> (new B[3]); // { dg-error "no match " }
} }
void void
...@@ -47,7 +46,7 @@ test02() ...@@ -47,7 +46,7 @@ test02()
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
std::experimental::shared_ptr<A[]> a(new A[3]); std::experimental::shared_ptr<A[]> a(new A[3]);
std::experimental::shared_ptr<A[2]> spa(a); // { dg-excess-errors "no matching" } std::experimental::shared_ptr<A[2]> spa(a); // { dg-error "no matching" }
} }
int int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment