mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-01 20:21:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

shared_ptr_base.h (__weak_ptr): Remove deleted comparison operators, per DR 1256.

Browse Source 
2010-02-19  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/shared_ptr_base.h (__weak_ptr): Remove deleted
	comparison operators, per DR 1256.
	* include/bits/shared_ptr.h (weak_ptr): Likewise.
	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust.

From-SVN: r156891
This commit is contained in:
Paolo Carlini 2010-02-19 10:42:47 +00:00 committed by Paolo Carlini
parent 604d0dbc8b
commit 415ed61204
4 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2010-02-19 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/shared_ptr_base.h (__weak_ptr): Remove deleted
comparison operators, per DR 1256.
* include/bits/shared_ptr.h (weak_ptr): Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust.
2010-02-18 Benjamin Kosnik <bkoz@redhat.com>
* scripts/run_doxygen: Add shortnames option.

10
libstdc++-v3/include/bits/shared_ptr.h
View File

@ -367,16 +367,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return this->expired() ? shared_ptr<_Tp>() : shared_ptr<_Tp>(*this);
#endif
}
// Comparisons
template<typename _Tp1>
bool operator<(const weak_ptr<_Tp1>&) const = delete;
template<typename _Tp1>
bool operator<=(const weak_ptr<_Tp1>&) const = delete;
template<typename _Tp1>
bool operator>(const weak_ptr<_Tp1>&) const = delete;
template<typename _Tp1>
bool operator>=(const weak_ptr<_Tp1>&) const = delete;
};
// 20.8.13.3.7 weak_ptr specialized algorithms.

13
libstdc++-v3/include/bits/shared_ptr_base.h
View File

@ -1022,19 +1022,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_M_refcount._M_swap(__s._M_refcount);
}
// Comparisons
template<typename _Tp1>
bool operator<(const __weak_ptr<_Tp1, _Lp>&) const = delete;
template<typename _Tp1>
bool operator<=(const __weak_ptr<_Tp1, _Lp>&) const = delete;
template<typename _Tp1>
bool operator>(const __weak_ptr<_Tp1, _Lp>&) const = delete;
template<typename _Tp1>
bool operator>=(const __weak_ptr<_Tp1, _Lp>&) const = delete;
private:
// Used by __enable_shared_from_this.
void

11
libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
View File

@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x " }
// { dg-do compile }
// Copyright (C) 2008, 2009 Free Software Foundation
// Copyright (C) 2008, 2009, 2010 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
@ -21,7 +21,6 @@
// 20.6.6.3 Template class weak_ptr [util.smartptr.weak]
#include <memory>
#include <testsuite_hooks.h>
struct A { };
@ -30,10 +29,10 @@ struct A { };
int
test01()
{
std::weak_ptr<A> p1;
// { dg-excess-errors "deleted function" }
p1 < p1; // { dg-error "used here" }
return 0;
std::weak_ptr<A> p1;
// { dg-excess-errors "candidates are" }
p1 < p1; // { dg-error "no match" }
return 0;
}
int