From 431346947588858c0944b32aae8aba71c00ebed3 Mon Sep 17 00:00:00 2001
From: Joe Thornber <ejt@redhat.com>
Date: Thu, 30 Apr 2020 15:02:43 +0100
Subject: [PATCH] [all] Switch from boost::shared_ptr -> std::shared_ptr.

Shared_ptr has moved into the standard library since these tools were
first written.
---
 base/application.h                            |  4 +-
 base/progress_monitor.h                       |  1 -
 block-cache/block_cache.h                     |  3 +-
 caching/cache_metadata.h                      |  2 +-
 caching/emitter.h                             |  3 +-
 caching/hint_array.cc                         | 46 +++++++++----------
 caching/hint_array.h                          |  4 +-
 caching/metadata.h                            |  2 +-
 configure.ac                                  |  1 -
 era/emitter.h                                 |  2 +-
 era/metadata.h                                |  2 +-
 era/writeset_tree.h                           |  4 +-
 persistent-data/block.h                       |  3 +-
 persistent-data/data-structures/array.h       |  4 +-
 persistent-data/data-structures/array_block.h |  2 +-
 persistent-data/data-structures/bitset.cc     |  2 +-
 persistent-data/data-structures/bitset.h      |  6 +--
 .../data-structures/bloom_filter.h            |  4 +-
 persistent-data/data-structures/btree.h       |  4 +-
 .../data-structures/btree_damage_visitor.h    |  2 +-
 persistent-data/data-structures/ref_counter.h |  4 +-
 persistent-data/error_set.h                   |  4 +-
 persistent-data/space-maps/careful_alloc.cc   |  4 +-
 persistent-data/space-maps/core.h             |  2 +-
 persistent-data/space-maps/disk.cc            | 10 ++--
 persistent-data/space-maps/noop.h             |  2 +-
 persistent-data/space_map.h                   |  7 ++-
 persistent-data/transaction_manager.h         |  3 +-
 thin-provisioning/device_tree.h               |  2 +-
 thin-provisioning/emitter.h                   |  4 +-
 thin-provisioning/mapping_tree.h              |  2 +-
 thin-provisioning/metadata.h                  |  2 +-
 thin-provisioning/metadata_checker.h          |  2 +-
 thin-provisioning/thin_debug.cc               |  2 +-
 thin-provisioning/thin_ll_dump.cc             |  2 +-
 thin-provisioning/thin_pool.h                 |  5 +-
 unit-tests/block_t.cc                         |  2 +-
 unit-tests/btree_damage_visitor_t.cc          |  4 +-
 unit-tests/cache_t.cc                         |  4 +-
 unit-tests/metadata_checker_t.cc              |  4 +-
 40 files changed, 78 insertions(+), 94 deletions(-)

diff --git a/base/application.h b/base/application.h
index 8363678..b799eaf 100644
--- a/base/application.h
+++ b/base/application.h
@@ -1,9 +1,9 @@
 #ifndef BASE_APPLICATION_H
 #define BASE_APPLICATION_H
 
-#include <boost/shared_ptr.hpp>
 #include <iostream>
 #include <list>
+#include <memory>
 #include <string>
 #include <stdexcept>
 #include <stdint.h>
@@ -13,7 +13,7 @@
 namespace base {
 	class command {
 	public:
-		typedef boost::shared_ptr<command> ptr;
+		typedef std::shared_ptr<command> ptr;
 
 		command(std::string const &name);
 		virtual ~command() {}
diff --git a/base/progress_monitor.h b/base/progress_monitor.h
index b3152d1..5a39492 100644
--- a/base/progress_monitor.h
+++ b/base/progress_monitor.h
@@ -1,7 +1,6 @@
 #ifndef BASE_PROGRESS_MONITOR_H
 #define BASE_PROGRESS_MONITOR_H
 
-#include <boost/shared_ptr.hpp>
 #include <memory>
 #include <string>
 
diff --git a/block-cache/block_cache.h b/block-cache/block_cache.h
index 0ef2231..5312468 100644
--- a/block-cache/block_cache.h
+++ b/block-cache/block_cache.h
@@ -8,7 +8,6 @@
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 #include <functional>
 #include <iostream>
 #include <libaio.h>
@@ -29,7 +28,7 @@ namespace bcache {
 
 	class validator {
 	public:
-		typedef boost::shared_ptr<validator> ptr;
+		typedef std::shared_ptr<validator> ptr;
 
 		virtual ~validator() {}
 
diff --git a/caching/cache_metadata.h b/caching/cache_metadata.h
index c03c04b..a89afd5 100644
--- a/caching/cache_metadata.h
+++ b/caching/cache_metadata.h
@@ -125,7 +125,7 @@ namespace cache {
 
 		typedef block_manager<>::read_ref read_ref;
 		typedef block_manager<>::write_ref write_ref;
-		typedef boost::shared_ptr<metadata> ptr;
+		typedef std::shared_ptr<metadata> ptr;
 
 		tm_ptr tm_;
 		superblock sb_;
diff --git a/caching/emitter.h b/caching/emitter.h
index 8a01d6c..0383865 100644
--- a/caching/emitter.h
+++ b/caching/emitter.h
@@ -3,7 +3,6 @@
 
 #include "persistent-data/block.h"
 
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 //----------------------------------------------------------------
@@ -13,7 +12,7 @@ namespace caching {
 
 	class emitter {
 	public:
-		typedef boost::shared_ptr<emitter> ptr;
+		typedef std::shared_ptr<emitter> ptr;
 
 		virtual ~emitter() {}
 
diff --git a/caching/hint_array.cc b/caching/hint_array.cc
index 66a3a27..6514968 100644
--- a/caching/hint_array.cc
+++ b/caching/hint_array.cc
@@ -38,16 +38,16 @@ namespace {
 	xx(4);
 
 	template <uint32_t WIDTH>
-	boost::shared_ptr<array_base> mk_array(transaction_manager &tm) {
+	std::shared_ptr<array_base> mk_array(transaction_manager &tm) {
 		typedef hint_traits<WIDTH> traits;
 		typedef persistent_data::array<traits> ha;
 
-		boost::shared_ptr<array_base> r = typename ha::ptr(new ha(tm, typename traits::ref_counter()));
+		std::shared_ptr<array_base> r = typename ha::ptr(new ha(tm, typename traits::ref_counter()));
 
 		return r;
 	}
 
-	boost::shared_ptr<array_base> mk_array(transaction_manager &tm, uint32_t width) {
+	std::shared_ptr<array_base> mk_array(transaction_manager &tm, uint32_t width) {
 		switch (width) {
 #define xx(n)	case n:	return mk_array<n>(tm)
 
@@ -58,15 +58,15 @@ namespace {
 		}
 
 		// never get here
-		return boost::shared_ptr<array_base>();
+		return std::shared_ptr<array_base>();
 	}
 
 	//--------------------------------
 
 	template <typename HA>
-	boost::shared_ptr<HA>
-	downcast_array(boost::shared_ptr<array_base> base) {
-		boost::shared_ptr<HA> a = dynamic_pointer_cast<HA>(base);
+	std::shared_ptr<HA>
+	downcast_array(std::shared_ptr<array_base> base) {
+		std::shared_ptr<HA> a = dynamic_pointer_cast<HA>(base);
 		if (!a)
 			throw runtime_error("internal error: couldn't cast hint array");
 
@@ -76,16 +76,16 @@ namespace {
 	//--------------------------------
 
 	template <uint32_t WIDTH>
-	boost::shared_ptr<array_base> mk_array(transaction_manager &tm, block_address root, unsigned nr_entries) {
+	std::shared_ptr<array_base> mk_array(transaction_manager &tm, block_address root, unsigned nr_entries) {
 		typedef hint_traits<WIDTH> traits;
 		typedef persistent_data::array<traits> ha;
 
-		boost::shared_ptr<array_base> r = typename ha::ptr(new ha(tm, typename traits::ref_counter(), root, nr_entries));
+		std::shared_ptr<array_base> r = typename ha::ptr(new ha(tm, typename traits::ref_counter(), root, nr_entries));
 
 		return r;
 	}
 
-	boost::shared_ptr<array_base> mk_array(transaction_manager &tm, uint32_t width, block_address root, unsigned nr_entries) {
+	std::shared_ptr<array_base> mk_array(transaction_manager &tm, uint32_t width, block_address root, unsigned nr_entries) {
 		switch (width) {
 #define xx(n)	case n:	return mk_array<n>(tm, root, nr_entries)
 			all_widths
@@ -95,21 +95,21 @@ namespace {
 		}
 
 		// never get here
-		return boost::shared_ptr<array_base>();
+		return std::shared_ptr<array_base>();
 	}
 
 	//--------------------------------
 
 	template <uint32_t WIDTH>
-	void get_hint(boost::shared_ptr<array_base> base, unsigned index, vector<unsigned char> &data) {
+	void get_hint(std::shared_ptr<array_base> base, unsigned index, vector<unsigned char> &data) {
 		typedef hint_traits<WIDTH> traits;
 		typedef persistent_data::array<traits> ha;
 
-		boost::shared_ptr<ha> a = downcast_array<ha>(base);
+		std::shared_ptr<ha> a = downcast_array<ha>(base);
 		data = a->get(index);
 	}
 
-	void get_hint_(uint32_t width, boost::shared_ptr<array_base> base, unsigned index, vector<unsigned char> &data) {
+	void get_hint_(uint32_t width, std::shared_ptr<array_base> base, unsigned index, vector<unsigned char> &data) {
 		switch (width) {
 #define xx(n) case n: return get_hint<n>(base, index, data)
 			all_widths
@@ -120,15 +120,15 @@ namespace {
 	//--------------------------------
 
 	template <uint32_t WIDTH>
-	void set_hint(boost::shared_ptr<array_base> base, unsigned index, vector<unsigned char> const &data) {
+	void set_hint(std::shared_ptr<array_base> base, unsigned index, vector<unsigned char> const &data) {
 		typedef hint_traits<WIDTH> traits;
 		typedef persistent_data::array<traits> ha;
 
-		boost::shared_ptr<ha> a = downcast_array<ha>(base);
+		std::shared_ptr<ha> a = downcast_array<ha>(base);
 		a->set(index, data);
 	}
 
-        void set_hint_(uint32_t width, boost::shared_ptr<array_base> base,
+        void set_hint_(uint32_t width, std::shared_ptr<array_base> base,
 		      unsigned index, vector<unsigned char> const &data) {
 		switch (width) {
 #define xx(n) case n: return set_hint<n>(base, index, data)
@@ -140,15 +140,15 @@ namespace {
 	//--------------------------------
 
 	template <uint32_t WIDTH>
-	void grow(boost::shared_ptr<array_base> base, unsigned new_nr_entries, vector<unsigned char> const &value) {
+	void grow(std::shared_ptr<array_base> base, unsigned new_nr_entries, vector<unsigned char> const &value) {
 		typedef hint_traits<WIDTH> traits;
 		typedef persistent_data::array<traits> ha;
 
-		boost::shared_ptr<ha> a = downcast_array<ha>(base);
+		std::shared_ptr<ha> a = downcast_array<ha>(base);
 		a->grow(new_nr_entries, value);
 	}
 
-	void grow_(uint32_t width, boost::shared_ptr<array_base> base,
+	void grow_(uint32_t width, std::shared_ptr<array_base> base,
 		   unsigned new_nr_entries, vector<unsigned char> const &value)
 	{
 		switch (width) {
@@ -194,17 +194,17 @@ namespace {
 	};
 
 	template <uint32_t WIDTH>
-	void walk_hints(boost::shared_ptr<array_base> base, hint_visitor &hv, damage_visitor &dv) {
+	void walk_hints(std::shared_ptr<array_base> base, hint_visitor &hv, damage_visitor &dv) {
 		typedef hint_traits<WIDTH> traits;
 		typedef persistent_data::array<traits> ha;
 
-		boost::shared_ptr<ha> a = downcast_array<ha>(base);
+		std::shared_ptr<ha> a = downcast_array<ha>(base);
 		value_adapter vv(hv);
 		ll_damage_visitor ll(dv);
 		a->visit_values(vv, ll);
 	}
 
-	void walk_hints_(uint32_t width, boost::shared_ptr<array_base> base,
+	void walk_hints_(uint32_t width, std::shared_ptr<array_base> base,
 			 hint_visitor &hv, damage_visitor &dv) {
 		switch (width) {
 #define xx(n) case n: walk_hints<n>(base, hv, dv); break
diff --git a/caching/hint_array.h b/caching/hint_array.h
index 45430cc..161422c 100644
--- a/caching/hint_array.h
+++ b/caching/hint_array.h
@@ -55,7 +55,7 @@ namespace caching {
 
 	class hint_array {
 	public:
-		typedef boost::shared_ptr<hint_array> ptr;
+		typedef std::shared_ptr<hint_array> ptr;
 
 		hint_array(transaction_manager &tm, unsigned width);
 		hint_array(transaction_manager &tm, unsigned width, block_address root, unsigned nr_entries);
@@ -77,7 +77,7 @@ namespace caching {
 		static uint32_t check_width(uint32_t width);
 
 		unsigned width_;
-		boost::shared_ptr<persistent_data::array_base> impl_;
+		std::shared_ptr<persistent_data::array_base> impl_;
 	};
 }
 
diff --git a/caching/metadata.h b/caching/metadata.h
index 7949c20..949139c 100644
--- a/caching/metadata.h
+++ b/caching/metadata.h
@@ -24,7 +24,7 @@ namespace caching {
 
 		typedef block_manager::read_ref read_ref;
 		typedef block_manager::write_ref write_ref;
-		typedef boost::shared_ptr<metadata> ptr;
+		typedef std::shared_ptr<metadata> ptr;
 
 		metadata(block_manager::ptr bm, open_type ot, unsigned metadata_version = 2); // Create only
 		metadata(block_manager::ptr bm);
diff --git a/configure.ac b/configure.ac
index 54bae31..16b9573 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,6 @@ AC_CHECK_HEADERS([expat.h \
 		  boost/lexical_cast.hpp \
 		  boost/noncopyable.hpp \
 		  boost/optional.hpp \
-		  boost/shared_ptr.hpp \
 		  boost/static_assert.hpp],
 		  [], [AC_MSG_ERROR(bailing out)])
 
diff --git a/era/emitter.h b/era/emitter.h
index c175384..340f5ed 100644
--- a/era/emitter.h
+++ b/era/emitter.h
@@ -10,7 +10,7 @@ namespace era {
 
 	class emitter {
 	public:
-		typedef boost::shared_ptr<emitter> ptr;
+		typedef std::shared_ptr<emitter> ptr;
 
 		virtual ~emitter() {}
 
diff --git a/era/metadata.h b/era/metadata.h
index 0a2ad3d..89321ca 100644
--- a/era/metadata.h
+++ b/era/metadata.h
@@ -25,7 +25,7 @@ namespace era {
 
 		typedef block_manager::read_ref read_ref;
 		typedef block_manager::write_ref write_ref;
-		typedef boost::shared_ptr<metadata> ptr;
+		typedef std::shared_ptr<metadata> ptr;
 
 		metadata(block_manager::ptr bm, open_type ot);
 		metadata(block_manager::ptr bm, block_address metadata_snap);
diff --git a/era/writeset_tree.h b/era/writeset_tree.h
index 9157ae6..b6a3e2a 100644
--- a/era/writeset_tree.h
+++ b/era/writeset_tree.h
@@ -46,7 +46,7 @@ namespace era {
 
 		class damage_visitor {
 		public:
-			typedef boost::shared_ptr<damage_visitor> ptr;
+			typedef std::shared_ptr<damage_visitor> ptr;
 
 			virtual ~damage_visitor() {}
 
@@ -60,7 +60,7 @@ namespace era {
 
 		class writeset_visitor {
 		public:
-			typedef boost::shared_ptr<writeset_visitor> ptr;
+			typedef std::shared_ptr<writeset_visitor> ptr;
 
 			virtual ~writeset_visitor() {}
 
diff --git a/persistent-data/block.h b/persistent-data/block.h
index 7d06fbd..1eada8f 100644
--- a/persistent-data/block.h
+++ b/persistent-data/block.h
@@ -27,7 +27,6 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <string>
 
@@ -40,7 +39,7 @@ namespace persistent_data {
 
 	class block_manager : private boost::noncopyable {
 	public:
-		typedef boost::shared_ptr<block_manager> ptr;
+		typedef std::shared_ptr<block_manager> ptr;
 
 		enum mode {
 			READ_ONLY,
diff --git a/persistent-data/data-structures/array.h b/persistent-data/data-structures/array.h
index 7348d1a..f7a3ac4 100644
--- a/persistent-data/data-structures/array.h
+++ b/persistent-data/data-structures/array.h
@@ -75,7 +75,7 @@ namespace persistent_data {
 		};
 
 		struct damage {
-			typedef boost::shared_ptr<damage> ptr;
+			typedef std::shared_ptr<damage> ptr;
 
 			damage(run<uint32_t> lost_keys,
 			       std::string const &desc)
@@ -222,7 +222,7 @@ namespace persistent_data {
 		typedef array_block<ValueTraits, block_manager::write_ref> wblock;
 		typedef array_block<ValueTraits, block_manager::read_ref> rblock;
 
-		typedef boost::shared_ptr<array<ValueTraits> > ptr;
+		typedef std::shared_ptr<array<ValueTraits> > ptr;
 		typedef typename ValueTraits::value_type value_type;
 		typedef typename ValueTraits::ref_counter ref_counter;
 
diff --git a/persistent-data/data-structures/array_block.h b/persistent-data/data-structures/array_block.h
index 21fae1b..7104c5b 100644
--- a/persistent-data/data-structures/array_block.h
+++ b/persistent-data/data-structures/array_block.h
@@ -36,7 +36,7 @@ namespace persistent_data {
 	template <typename ValueTraits, typename RefType>
 	class array_block {
 	public:
-		typedef boost::shared_ptr<array_block> ptr;
+		typedef std::shared_ptr<array_block> ptr;
 		typedef typename ValueTraits::disk_type disk_type;
 		typedef typename ValueTraits::value_type value_type;
 		typedef typename ValueTraits::ref_counter ref_counter;
diff --git a/persistent-data/data-structures/bitset.cc b/persistent-data/data-structures/bitset.cc
index b0d9e34..a4f0b67 100644
--- a/persistent-data/data-structures/bitset.cc
+++ b/persistent-data/data-structures/bitset.cc
@@ -30,7 +30,7 @@ namespace persistent_data {
 
 		class bitset_impl {
 		public:
-			typedef boost::shared_ptr<bitset_impl> ptr;
+			typedef std::shared_ptr<bitset_impl> ptr;
 			typedef persistent_data::transaction_manager::ptr tm_ptr;
 
 			bitset_impl(transaction_manager &tm)
diff --git a/persistent-data/data-structures/bitset.h b/persistent-data/data-structures/bitset.h
index 3b69cb9..ca98a86 100644
--- a/persistent-data/data-structures/bitset.h
+++ b/persistent-data/data-structures/bitset.h
@@ -38,7 +38,7 @@ namespace persistent_data {
 
 		class bitset_visitor {
 		public:
-			typedef boost::shared_ptr<bitset_visitor> ptr;
+			typedef std::shared_ptr<bitset_visitor> ptr;
 
 			virtual ~bitset_visitor() {}
 			virtual void visit(uint32_t index, bool value) = 0;
@@ -48,7 +48,7 @@ namespace persistent_data {
 
 	class bitset {
 	public:
-		typedef boost::shared_ptr<bitset> ptr;
+		typedef std::shared_ptr<bitset> ptr;
 
 		bitset(transaction_manager &tm);
 		bitset(transaction_manager &tm,
@@ -66,7 +66,7 @@ namespace persistent_data {
 		void walk_bitset(bitset_detail::bitset_visitor &v) const;
 
 	private:
-		boost::shared_ptr<bitset_detail::bitset_impl> impl_;
+		std::shared_ptr<bitset_detail::bitset_impl> impl_;
 	};
 }
 
diff --git a/persistent-data/data-structures/bloom_filter.h b/persistent-data/data-structures/bloom_filter.h
index 30b38e9..5b3d924 100644
--- a/persistent-data/data-structures/bloom_filter.h
+++ b/persistent-data/data-structures/bloom_filter.h
@@ -4,14 +4,12 @@
 #include "persistent-data/transaction_manager.h"
 #include "persistent-data/data-structures/bitset.h"
 
-#include <boost/shared_ptr.hpp>
-
 //----------------------------------------------------------------
 
 namespace persistent_data {
 	class bloom_filter {
 	public:
-		typedef boost::shared_ptr<bloom_filter> ptr;
+		typedef std::shared_ptr<bloom_filter> ptr;
 
 		// nr_bits must be a power of two
 		bloom_filter(transaction_manager &tm,
diff --git a/persistent-data/data-structures/btree.h b/persistent-data/data-structures/btree.h
index bd1252a..3b84df7 100644
--- a/persistent-data/data-structures/btree.h
+++ b/persistent-data/data-structures/btree.h
@@ -298,7 +298,7 @@ namespace persistent_data {
 	template <unsigned Levels, typename ValueTraits>
 	class btree {
 	public:
-		typedef boost::shared_ptr<btree<Levels, ValueTraits> > ptr;
+		typedef std::shared_ptr<btree<Levels, ValueTraits> > ptr;
 
 		typedef uint64_t key[Levels];
 		typedef typename ValueTraits::value_type value_type;
@@ -338,7 +338,7 @@ namespace persistent_data {
 		// inspect the individual nodes that make up a btree.
 		class visitor {
 		public:
-			typedef boost::shared_ptr<visitor> ptr;
+			typedef std::shared_ptr<visitor> ptr;
 			typedef btree_detail::node_location node_location;
 
 			virtual ~visitor() {}
diff --git a/persistent-data/data-structures/btree_damage_visitor.h b/persistent-data/data-structures/btree_damage_visitor.h
index 0d2031a..b57c553 100644
--- a/persistent-data/data-structures/btree_damage_visitor.h
+++ b/persistent-data/data-structures/btree_damage_visitor.h
@@ -10,7 +10,7 @@
 namespace persistent_data {
 	namespace btree_detail {
 		struct damage {
-			typedef boost::shared_ptr<damage> ptr;
+			typedef std::shared_ptr<damage> ptr;
 
 			damage(run<uint64_t> lost_keys,
 			       std::string const &desc)
diff --git a/persistent-data/data-structures/ref_counter.h b/persistent-data/data-structures/ref_counter.h
index 99e17cd..6958df7 100644
--- a/persistent-data/data-structures/ref_counter.h
+++ b/persistent-data/data-structures/ref_counter.h
@@ -19,15 +19,13 @@
 #ifndef REF_COUNTER_H
 #define REF_COUNTER_H
 
-#include <boost/shared_ptr.hpp>
-
 //----------------------------------------------------------------
 
 namespace persistent_data {
 	template <typename ValueType>
 	class ref_counter {
 	public:
-		boost::shared_ptr<ref_counter<ValueType> > ptr;
+		std::shared_ptr<ref_counter<ValueType> > ptr;
 
 		virtual ~ref_counter() {}
 
diff --git a/persistent-data/error_set.h b/persistent-data/error_set.h
index f3b5ece..3646244 100644
--- a/persistent-data/error_set.h
+++ b/persistent-data/error_set.h
@@ -20,8 +20,8 @@
 #define ERROR_SET_H
 
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
 #include <list>
+#include <memory>
 #include <iosfwd>
 #include <string>
 
@@ -34,7 +34,7 @@ namespace persistent_data {
 	// user can control how much detail is displayed.
 	class error_set {
 	public:
-		typedef boost::shared_ptr<error_set> ptr;
+		typedef std::shared_ptr<error_set> ptr;
 
 		error_set(std::string const &err);
 
diff --git a/persistent-data/space-maps/careful_alloc.cc b/persistent-data/space-maps/careful_alloc.cc
index 018590c..9991430 100644
--- a/persistent-data/space-maps/careful_alloc.cc
+++ b/persistent-data/space-maps/careful_alloc.cc
@@ -19,8 +19,6 @@
 #include "persistent-data/space-maps/careful_alloc.h"
 #include "persistent-data/space-maps/subtracting_span_iterator.h"
 
-#include <boost/shared_ptr.hpp>
-
 using namespace std;
 
 //----------------------------------------------------------------
@@ -30,7 +28,7 @@ namespace {
 
 	class sm_careful_alloc : public checked_space_map {
 	public:
-		typedef boost::shared_ptr<sm_careful_alloc> ptr;
+		typedef std::shared_ptr<sm_careful_alloc> ptr;
 
 		sm_careful_alloc(checked_space_map::ptr sm)
 			: sm_(sm) {
diff --git a/persistent-data/space-maps/core.h b/persistent-data/space-maps/core.h
index 85ee990..e2af33a 100644
--- a/persistent-data/space-maps/core.h
+++ b/persistent-data/space-maps/core.h
@@ -26,7 +26,7 @@
 namespace persistent_data {
 	class core_map : public checked_space_map {
 	public:
-		typedef boost::shared_ptr<core_map> ptr;
+		typedef std::shared_ptr<core_map> ptr;
 
 		core_map(block_address nr_blocks)
 			: counts_(nr_blocks, 0),
diff --git a/persistent-data/space-maps/disk.cc b/persistent-data/space-maps/disk.cc
index 18736cd..4b7db49 100644
--- a/persistent-data/space-maps/disk.cc
+++ b/persistent-data/space-maps/disk.cc
@@ -250,7 +250,7 @@ namespace {
 #if 0
 	class ref_count_checker : public btree_checker<1, ref_count_traits> {
 	public:
-		typedef boost::shared_ptr<ref_count_checker> ptr;
+		typedef std::shared_ptr<ref_count_checker> ptr;
 
 		ref_count_checker(block_counter &counter)
 			: btree_checker<1, ref_count_traits>(counter) {
@@ -267,7 +267,7 @@ namespace {
 
 	class index_store {
 	public:
-		typedef boost::shared_ptr<index_store> ptr;
+		typedef std::shared_ptr<index_store> ptr;
 
 		virtual ~index_store() {}
 
@@ -285,7 +285,7 @@ namespace {
 
 	class sm_disk : public checked_space_map {
 	public:
-		typedef boost::shared_ptr<sm_disk> ptr;
+		typedef std::shared_ptr<sm_disk> ptr;
 		typedef transaction_manager::read_ref read_ref;
 		typedef transaction_manager::write_ref write_ref;
 
@@ -635,7 +635,7 @@ namespace {
 
 	class btree_index_store : public index_store {
 	public:
-		typedef boost::shared_ptr<btree_index_store> ptr;
+		typedef std::shared_ptr<btree_index_store> ptr;
 
 		btree_index_store(transaction_manager &tm)
 			: tm_(tm),
@@ -714,7 +714,7 @@ namespace {
 
 	class metadata_index_store : public index_store {
 	public:
-		typedef boost::shared_ptr<metadata_index_store> ptr;
+		typedef std::shared_ptr<metadata_index_store> ptr;
 
 		metadata_index_store(transaction_manager &tm)
 			: tm_(tm) {
diff --git a/persistent-data/space-maps/noop.h b/persistent-data/space-maps/noop.h
index 6f71290..fdd58a4 100644
--- a/persistent-data/space-maps/noop.h
+++ b/persistent-data/space-maps/noop.h
@@ -26,7 +26,7 @@
 namespace persistent_data {
 	class noop_map : public checked_space_map {
 	public:
-		typedef boost::shared_ptr<noop_map> ptr;
+		typedef std::shared_ptr<noop_map> ptr;
 
 		block_address get_nr_blocks() const {
 			fail();
diff --git a/persistent-data/space_map.h b/persistent-data/space_map.h
index 364f28e..c3f66da 100644
--- a/persistent-data/space_map.h
+++ b/persistent-data/space_map.h
@@ -23,7 +23,6 @@
 #include "persistent-data/block_counter.h"
 #include "persistent-data/run.h"
 
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <functional>
 
@@ -36,7 +35,7 @@ namespace persistent_data {
 
 	class space_map {
 	public:
-		typedef boost::shared_ptr<space_map> ptr;
+		typedef std::shared_ptr<space_map> ptr;
 
 		virtual ~space_map() {};
 
@@ -140,7 +139,7 @@ namespace persistent_data {
 
 	class persistent_space_map : public space_map {
 	public:
-		typedef boost::shared_ptr<persistent_space_map> ptr;
+		typedef std::shared_ptr<persistent_space_map> ptr;
 
 		virtual void count_metadata(block_counter &bc) const = 0;
 		virtual size_t root_size() const = 0;
@@ -149,7 +148,7 @@ namespace persistent_data {
 
 	class checked_space_map : public persistent_space_map {
 	public:
-		typedef boost::shared_ptr<checked_space_map> ptr;
+		typedef std::shared_ptr<checked_space_map> ptr;
 
 		virtual void visit(space_map_detail::visitor &v) const {
 			throw std::runtime_error("space_map.visit not implemented");
diff --git a/persistent-data/transaction_manager.h b/persistent-data/transaction_manager.h
index 26264e2..7df2cc5 100644
--- a/persistent-data/transaction_manager.h
+++ b/persistent-data/transaction_manager.h
@@ -23,14 +23,13 @@
 #include "space_map.h"
 
 #include <set>
-#include <boost/shared_ptr.hpp>
 
 //----------------------------------------------------------------
 
 namespace persistent_data {
 	class transaction_manager : boost::noncopyable {
 	public:
-		typedef boost::shared_ptr<transaction_manager> ptr;
+		typedef std::shared_ptr<transaction_manager> ptr;
 		typedef block_manager::read_ref read_ref;
 		typedef block_manager::write_ref write_ref;
 		typedef bcache::validator::ptr validator;
diff --git a/thin-provisioning/device_tree.h b/thin-provisioning/device_tree.h
index ec0f9f2..d284ac5 100644
--- a/thin-provisioning/device_tree.h
+++ b/thin-provisioning/device_tree.h
@@ -50,7 +50,7 @@ namespace thin_provisioning {
 
 		class damage_visitor {
 		public:
-			typedef boost::shared_ptr<damage_visitor> ptr;
+			typedef std::shared_ptr<damage_visitor> ptr;
 
 			virtual ~damage_visitor() {}
 
diff --git a/thin-provisioning/emitter.h b/thin-provisioning/emitter.h
index 83a0397..82fe2e6 100644
--- a/thin-provisioning/emitter.h
+++ b/thin-provisioning/emitter.h
@@ -19,10 +19,10 @@
 #ifndef EMITTER_H
 #define EMITTER_H
 
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/optional/optional_io.hpp>
 
+#include <memory>
 #include <string>
 #include <stdint.h>
 
@@ -44,7 +44,7 @@ namespace thin_provisioning {
 
 	class emitter {
 	public:
-		typedef boost::shared_ptr<emitter> ptr;
+		typedef std::shared_ptr<emitter> ptr;
 
 		virtual ~emitter() {}
 
diff --git a/thin-provisioning/mapping_tree.h b/thin-provisioning/mapping_tree.h
index 4475cf0..22ad514 100644
--- a/thin-provisioning/mapping_tree.h
+++ b/thin-provisioning/mapping_tree.h
@@ -96,7 +96,7 @@ namespace thin_provisioning {
 
 		class damage_visitor {
 		public:
-			typedef boost::shared_ptr<damage_visitor> ptr;
+			typedef std::shared_ptr<damage_visitor> ptr;
 
 			virtual ~damage_visitor() {}
 
diff --git a/thin-provisioning/metadata.h b/thin-provisioning/metadata.h
index ca98566..e8bb5fc 100644
--- a/thin-provisioning/metadata.h
+++ b/thin-provisioning/metadata.h
@@ -57,7 +57,7 @@ namespace thin_provisioning {
 
 		typedef block_manager::read_ref read_ref;
 		typedef block_manager::write_ref write_ref;
-		typedef boost::shared_ptr<metadata> ptr;
+		typedef std::shared_ptr<metadata> ptr;
 
 		metadata(block_manager::ptr bm, open_type ot,
 			 sector_t data_block_size = 128,
diff --git a/thin-provisioning/metadata_checker.h b/thin-provisioning/metadata_checker.h
index 48c82b9..7cf6683 100644
--- a/thin-provisioning/metadata_checker.h
+++ b/thin-provisioning/metadata_checker.h
@@ -56,7 +56,7 @@ namespace thin_provisioning {
 
 	class metadata_checker {
 	public:
-		typedef boost::shared_ptr<metadata_checker> ptr;
+		typedef std::shared_ptr<metadata_checker> ptr;
 
 		virtual ~metadata_checker() {}
 
diff --git a/thin-provisioning/thin_debug.cc b/thin-provisioning/thin_debug.cc
index acfdc61..48ad544 100644
--- a/thin-provisioning/thin_debug.cc
+++ b/thin-provisioning/thin_debug.cc
@@ -111,7 +111,7 @@ namespace {
 
 	class command {
 	public:
-		typedef boost::shared_ptr<command> ptr;
+		typedef std::shared_ptr<command> ptr;
 
 		virtual ~command() {}
 		virtual void exec(strings const &args, ostream &out) = 0;
diff --git a/thin-provisioning/thin_ll_dump.cc b/thin-provisioning/thin_ll_dump.cc
index 2c63b37..71896ad 100644
--- a/thin-provisioning/thin_ll_dump.cc
+++ b/thin-provisioning/thin_ll_dump.cc
@@ -52,7 +52,7 @@ namespace {
 	//-------------------------------------------------------------------
 
 	struct btree_node_checker {
-		typedef boost::shared_ptr<btree_node_checker> ptr;
+		typedef std::shared_ptr<btree_node_checker> ptr;
 		virtual ~btree_node_checker() {}
 		virtual bool check(node_ref<uint64_traits> &n) = 0;
 	};
diff --git a/thin-provisioning/thin_pool.h b/thin-provisioning/thin_pool.h
index 0c6b156..fe4248b 100644
--- a/thin-provisioning/thin_pool.h
+++ b/thin-provisioning/thin_pool.h
@@ -22,7 +22,6 @@
 #include "metadata.h"
 
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 //----------------------------------------------------------------
 
@@ -34,7 +33,7 @@ namespace thin_provisioning {
 	class thin_pool;
 	class thin {
 	public:
-		typedef boost::shared_ptr<thin> ptr;
+		typedef std::shared_ptr<thin> ptr;
 		typedef boost::optional<mapping_tree_detail::block_time> maybe_address;
 
 		thin_dev_t get_dev_t() const;
@@ -57,7 +56,7 @@ namespace thin_provisioning {
 
 	class thin_pool {
 	public:
-		typedef boost::shared_ptr<thin_pool> ptr;
+		typedef std::shared_ptr<thin_pool> ptr;
 
 		thin_pool(metadata::ptr md);
 		~thin_pool();
diff --git a/unit-tests/block_t.cc b/unit-tests/block_t.cc
index 07d3ab3..b232cc0 100644
--- a/unit-tests/block_t.cc
+++ b/unit-tests/block_t.cc
@@ -61,7 +61,7 @@ namespace {
 
 	class validator_mock : public bcache::validator {
 	public:
-		typedef boost::shared_ptr<validator_mock> ptr;
+		typedef std::shared_ptr<validator_mock> ptr;
 
 		MOCK_CONST_METHOD2(check, void(void const *, block_address));
 		MOCK_CONST_METHOD1(check_raw, bool(void const *data));
diff --git a/unit-tests/btree_damage_visitor_t.cc b/unit-tests/btree_damage_visitor_t.cc
index b4f1129..81867e8 100644
--- a/unit-tests/btree_damage_visitor_t.cc
+++ b/unit-tests/btree_damage_visitor_t.cc
@@ -66,7 +66,7 @@ namespace {
 	//--------------------------------
 
 	struct node_info {
-		typedef boost::shared_ptr<node_info> ptr;
+		typedef std::shared_ptr<node_info> ptr;
 
 		btree_detail::btree_path path;
 
@@ -170,7 +170,7 @@ namespace {
 	public:
 		typedef btree_detail::node_location node_location;
 		typedef btree<Levels, ValueTraits> tree;
-		typedef boost::shared_ptr<btree_layout_visitor> ptr;
+		typedef std::shared_ptr<btree_layout_visitor> ptr;
 
 		virtual bool visit_internal(node_location const &loc,
 					    typename tree::internal_node const &n) {
diff --git a/unit-tests/cache_t.cc b/unit-tests/cache_t.cc
index aaf1257..ecce000 100644
--- a/unit-tests/cache_t.cc
+++ b/unit-tests/cache_t.cc
@@ -19,8 +19,6 @@
 #include "gmock/gmock.h"
 #include "persistent-data/cache.h"
 
-#include <boost/shared_ptr.hpp>
-
 using namespace boost;
 using namespace base;
 using namespace std;
@@ -55,7 +53,7 @@ namespace {
 
 	struct SharedThingTraits {
 		typedef unsigned key_type;
-		typedef boost::shared_ptr<Thing> value_type;
+		typedef std::shared_ptr<Thing> value_type;
 
 		static key_type get_key(value_type const &p) {
 			return p->key_;
diff --git a/unit-tests/metadata_checker_t.cc b/unit-tests/metadata_checker_t.cc
index 8fed494..1f4ec6a 100644
--- a/unit-tests/metadata_checker_t.cc
+++ b/unit-tests/metadata_checker_t.cc
@@ -61,7 +61,7 @@ namespace {
 	class devices_visitor : public detail_tree::visitor {
 	public:
 		struct node_info {
-			typedef boost::shared_ptr<node_info> ptr;
+			typedef std::shared_ptr<node_info> ptr;
 
 			bool leaf;
 			unsigned depth;
@@ -71,7 +71,7 @@ namespace {
 		};
 
 		typedef btree_detail::node_location node_location;
-		typedef boost::shared_ptr<devices_visitor> ptr;
+		typedef std::shared_ptr<devices_visitor> ptr;
 
 		virtual bool visit_internal(node_location const &loc,
 					    detail_tree::internal_node const &n) {