diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-02-19 18:10:29 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-02-19 18:10:29 +0000 |
| commit | dbffa6761a64972bb9531d85317a0943cd4069ac (patch) | |
| tree | 01ccbf52888a5f9fbe02bafcd529d62b373d8934 /libstdc++-v3/include/bits/shared_ptr.h | |
| parent | ff089219c8acded3c3857a88cd7219e0fa5c66d6 (diff) | |
| download | gcc-dbffa6761a64972bb9531d85317a0943cd4069ac.tar.gz | |
2010-02-19 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 156900
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@156902 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/shared_ptr.h')
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index 8119ad3e1f0..b204699db20 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -60,7 +60,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) /// 2.2.3.7 shared_ptr I/O template<typename _Ch, typename _Tr, typename _Tp, _Lock_policy _Lp> - std::basic_ostream<_Ch, _Tr>& + inline std::basic_ostream<_Ch, _Tr>& operator<<(std::basic_ostream<_Ch, _Tr>& __os, const __shared_ptr<_Tp, _Lp>& __p) { @@ -119,7 +119,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * * __shared_ptr will release __p by calling __d(__p) */ - template<typename _Tp1, typename _Deleter> + template<typename _Tp1, typename _Deleter> shared_ptr(_Tp1* __p, _Deleter __d) : __shared_ptr<_Tp>(__p, __d) { } /** @@ -210,9 +210,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif template<typename _Tp1, typename _Del> - explicit shared_ptr(const std::unique_ptr<_Tp1, _Del>&) = delete; - - template<typename _Tp1, typename _Del> explicit shared_ptr(std::unique_ptr<_Tp1, _Del>&& __r) : __shared_ptr<_Tp>(std::move(__r)) { } @@ -251,10 +248,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template<typename _Tp1, typename _Del> shared_ptr& - operator=(const std::unique_ptr<_Tp1, _Del>& __r) = delete; - - template<typename _Tp1, typename _Del> - shared_ptr& operator=(std::unique_ptr<_Tp1, _Del>&& __r) { this->__shared_ptr<_Tp>::operator=(std::move(__r)); @@ -374,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. |