summaryrefslogtreecommitdiffstats
path: root/indexlib/boost-compat/shared_ptr.h
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-01-23 10:13:00 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-01-26 11:05:01 +0900
commit3b1e4bbb3df6a0de8aa0693038449c6f0359ce91 (patch)
tree068068e7b1b6202c635bd655e346f838d715373c /indexlib/boost-compat/shared_ptr.h
parentb0f8eef013163b2098c2bb07e93cb9b194338b80 (diff)
downloadtdepim-3b1e4bbb3df6a0de8aa0693038449c6f0359ce91.tar.gz
tdepim-3b1e4bbb3df6a0de8aa0693038449c6f0359ce91.zip
Replace auto_ptr
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit d2f343cc239e1fa25c9581cf35bada96692c41db)
Diffstat (limited to 'indexlib/boost-compat/shared_ptr.h')
-rw-r--r--indexlib/boost-compat/shared_ptr.h33
1 files changed, 5 insertions, 28 deletions
diff --git a/indexlib/boost-compat/shared_ptr.h b/indexlib/boost-compat/shared_ptr.h
index c236e3bd..a242c829 100644
--- a/indexlib/boost-compat/shared_ptr.h
+++ b/indexlib/boost-compat/shared_ptr.h
@@ -26,11 +26,11 @@
#include <boost/detail/shared_count.hpp>
#include <boost/detail/workaround.hpp>
-#include <memory> // for std::auto_ptr
-#include <algorithm> // for std::swap
-#include <functional> // for std::less
-#include <typeinfo> // for std::bad_cast
-#include <iosfwd> // for std::basic_ostream
+#include <memory>
+#include <algorithm>
+#include <functional>
+#include <typeinfo>
+#include <iosfwd>
#ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
# pragma warning(push)
@@ -191,18 +191,6 @@ public:
}
}
-#ifndef BOOST_NO_AUTO_PTR
-
- template<class Y>
- explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn()
- {
- Y * tmp = r.get();
- pn = detail::shared_count(r);
- detail::sp_enable_shared_from_this( pn, tmp, tmp );
- }
-
-#endif
-
#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
template<class Y>
@@ -215,17 +203,6 @@ public:
#endif
-#ifndef BOOST_NO_AUTO_PTR
-
- template<class Y>
- shared_ptr & operator=(std::auto_ptr<Y> & r)
- {
- this_type(r).swap(*this);
- return *this;
- }
-
-#endif
-
void reset() // never throws in 1.30+
{
this_type().swap(*this);