diff options
Diffstat (limited to 'libstdc++-v3/include/bits/shared_ptr.h')
| -rw-r--r-- | libstdc++-v3/include/bits/shared_ptr.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index 070d2d1360b..784336505b2 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -1,6 +1,6 @@ // shared_ptr and weak_ptr implementation -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +// Copyright (C) 2007-2012 Free Software Foundation, Inc. // // 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 @@ -250,8 +250,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if _GLIBCXX_USE_DEPRECATED template<typename _Tp1> - shared_ptr(std::auto_ptr<_Tp1>&& __r) - : __shared_ptr<_Tp>(std::move(__r)) { } + shared_ptr(std::auto_ptr<_Tp1>&& __r); #endif template<typename _Tp1, typename _Del> @@ -322,7 +321,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION allocate_shared(const _Alloc& __a, _Args&&... __args); }; - // 20.8.13.2.7 shared_ptr comparisons + // 20.7.2.2.7 shared_ptr comparisons template<typename _Tp1, typename _Tp2> inline bool operator==(const shared_ptr<_Tp1>& __a, @@ -426,13 +425,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct less<shared_ptr<_Tp>> : public _Sp_less<shared_ptr<_Tp>> { }; - // 20.8.13.2.9 shared_ptr specialized algorithms. + // 20.7.2.2.8 shared_ptr specialized algorithms. template<typename _Tp> inline void swap(shared_ptr<_Tp>& __a, shared_ptr<_Tp>& __b) noexcept { __a.swap(__b); } - // 20.8.13.2.10 shared_ptr casts. + // 20.7.2.2.9 shared_ptr casts. template<typename _Tp, typename _Tp1> inline shared_ptr<_Tp> static_pointer_cast(const shared_ptr<_Tp1>& __r) noexcept @@ -512,7 +511,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } }; - // 20.8.13.3.7 weak_ptr specialized algorithms. + // 20.7.2.3.6 weak_ptr specialized algorithms. template<typename _Tp> inline void swap(weak_ptr<_Tp>& __a, weak_ptr<_Tp>& __b) noexcept |