Allow moving of ResourceHandles

3 files changed, 54 insertions, 0 deletions

diff --git a/libadhocutil/resourcePool.h b/libadhocutil/resourcePool.h
index 9bb03f6..bcc870b 100644
--- a/libadhocutil/resourcePool.h
+++ b/libadhocutil/resourcePool.h
@@ -26,10 +26,14 @@ namespace AdHoc {
 			ResourceHandle(const std::shared_ptr<Object> &);
 			/// Create a reference to an existing resource.
 			ResourceHandle(const ResourceHandle &);
+			/// Move reference to an existing resource.
+			ResourceHandle(ResourceHandle &&);
 			~ResourceHandle();
 
 			/// Reference to an existing resource.
 			void operator=(const ResourceHandle &);
+			/// Move reference to an existing resource.
+			void operator=(ResourceHandle &&);
 			/// Access to the resource.
 			Resource * operator->() const;
 			/// Access to the resource.
diff --git a/libadhocutil/resourcePool.impl.h b/libadhocutil/resourcePool.impl.h
index 49f91a5..1f605a5 100644
--- a/libadhocutil/resourcePool.impl.h
+++ b/libadhocutil/resourcePool.impl.h
@@ -25,6 +25,13 @@ namespace AdHoc {
 	}
 
 	template <typename R>
+	ResourceHandle<R>::ResourceHandle(ResourceHandle && rh) :
+		resource(rh.resource)
+	{
+		rh.decRef();
+	}
+
+	template <typename R>
 	ResourceHandle<R>::~ResourceHandle()
 	{
 		if (resource) {
@@ -82,6 +89,17 @@ namespace AdHoc {
 
 	template <typename R>
 	void
+	ResourceHandle<R>::operator=(ResourceHandle && rh)
+	{
+		if (resource) {
+			decRef();
+		}
+		resource = rh.resource;
+		rh.decRef();
+	}
+
+	template <typename R>
+	void
 	ResourceHandle<R>::decRef()
 	{
 		ASSERT(resource);
diff --git a/libadhocutil/unittests/testResourcePool.cpp b/libadhocutil/unittests/testResourcePool.cpp
index e37cc85..04e66b8 100644
--- a/libadhocutil/unittests/testResourcePool.cpp
+++ b/libadhocutil/unittests/testResourcePool.cpp
@@ -146,6 +146,38 @@ BOOST_AUTO_TEST_CASE( getMineNoCurrent )
 	BOOST_REQUIRE_THROW(pool.getMine(), AdHoc::NoCurrentResource);
 }
 
+BOOST_AUTO_TEST_CASE( move )
+{
+	TRP pool;
+	{
+		auto r1 = pool.get();
+		BOOST_CHECK_EQUAL(pool.inUseCount(), 1);
+		BOOST_CHECK(r1);
+		{
+			auto r2(std::move(r1));
+			BOOST_CHECK_EQUAL(pool.inUseCount(), 1);
+			BOOST_CHECK(!r1);
+			BOOST_CHECK(r2);
+
+			r1 = std::move(r2);
+			BOOST_CHECK_EQUAL(pool.inUseCount(), 1);
+			BOOST_CHECK(r1);
+			BOOST_CHECK(!r2);
+
+			r2 = pool.get();
+			BOOST_CHECK_EQUAL(pool.inUseCount(), 2);
+			BOOST_CHECK(r2);
+
+			r1 = std::move(r2);
+			BOOST_CHECK_EQUAL(pool.inUseCount(), 1);
+			BOOST_CHECK(r1);
+			BOOST_CHECK(!r2);
+		}
+		BOOST_CHECK_EQUAL(pool.inUseCount(), 1);
+	}
+	BOOST_CHECK_EQUAL(pool.inUseCount(), 0);
+}
+
 BOOST_AUTO_TEST_CASE( discard )
 {
 	TRP pool;