move construction and operators =

include/cif++/v2/category.hpp

@@ -147,8 +147,15 @@ class category_t
 			insert_impl(cend(), clone_row(*r));
 	}
 
-	category_t(category_t &&)
+	category_t(category_t &&rhs)
+		: m_allocator(std::move(rhs.m_allocator))
+		, m_name(std::move(rhs.m_name))
+		, m_columns(std::move(rhs.m_columns))
+		, m_head(rhs.m_head)
+		, m_tail(rhs.m_tail)
 	{
+		rhs.m_head = nullptr;
+		rhs.m_tail = nullptr;
 	}
 
 	template <typename Alloc2>
@@ -165,31 +172,47 @@ class category_t
 	{
 	}
 
-	category_t &operator=(const category_t &)
+	category_t &operator=(const category_t &rhs)
 	{
-	}
+		if (this != &rhs)
+		{
+			if (not empty())
+				clear();
 
-	category_t &operator=(category_t &&)
-	{
+			m_allocator = std::allocator_traits<allocator_type>::select_on_container_copy_construction(rhs.get_allocator());
+			m_name = rhs.m_name;
+			m_columns = rhs.m_columns;
+
+			for (auto r = rhs.m_head; r != nullptr; r = r->m_next)
+				insert_impl(cend(), clone_row(*r));
+		}
+
+		return *this;
 	}
 
-	~category_t()
+	category_t &operator=(category_t &&rhs)
 	{
-		auto r = m_head;
-		while (r != nullptr)
+		if (this != &rhs)
 		{
-			auto i = r->m_head;
-			while (i != nullptr)
-			{
-				auto ti = i->m_next;
-				delete_item(i);
-				i = ti;
-			}
+			if (not empty())
+				clear();
+
+			m_allocator = std::move(rhs.m_allocator);
+			m_name = std::move(rhs.m_name);
+			m_columns = std::move(rhs.m_columns);
 
-			auto t = r->m_next;
-			delete_row(r);
-			r = t;
+			m_head = rhs.m_head;
+			m_tail = rhs.m_tail;
+
+			rhs.m_head = rhs.m_tail = nullptr;
 		}
+
+		return *this;
+	}
+
+	~category_t()
+	{
+		clear();
 	}
 
 	// --------------------------------------------------------------------
@@ -365,6 +388,19 @@ class category_t
 		// 	mIndex->insert(nr);
 	}
 
+	void clear()
+	{
+		auto i = m_head;
+		while (i != nullptr)
+		{
+			auto t = i;
+			i = i->m_next;
+			delete_row(t);
+		}
+
+		m_head = m_tail = nullptr;
+	}
+
 	// --------------------------------------------------------------------
 	/// \brief Return the index number for \a column_name
 
@@ -508,9 +544,20 @@ class category_t
 
 	void delete_row(row *r)
 	{
-		row_allocator_type ra(get_allocator());
-		row_allocator_traits::destroy(ra, r);
-		row_allocator_traits::deallocate(ra, r, 1);
+		if (r != nullptr)
+		{
+			auto i = r->m_head;
+			while (i != nullptr)
+			{
+				auto t = i;
+				i = i->m_next;
+				delete_item(t);
+			}
+
+			row_allocator_type ra(get_allocator());
+			row_allocator_traits::destroy(ra, r);
+			row_allocator_traits::deallocate(ra, r, 1);
+		}
 	}
 
 	struct item_column

test/unit-v2-test.cpp

@@ -221,6 +221,23 @@ BOOST_AUTO_TEST_CASE(c_2)
 	BOOST_CHECK(not c2.empty());
 	BOOST_CHECK_EQUAL(c2.size(), 3);
 
+	cif::v2::category c3(std::move(c));
+
+	BOOST_CHECK(not c3.empty());
+	BOOST_CHECK_EQUAL(c3.size(), 3);
+
+	BOOST_CHECK(c.empty());
+	BOOST_CHECK_EQUAL(c.size(), 0);
+
+	c = c3;
+
+	BOOST_CHECK(not c.empty());
+	BOOST_CHECK_EQUAL(c.size(), 3);
+
+	c = std::move(c2);
+
+	BOOST_CHECK(not c.empty());
+	BOOST_CHECK_EQUAL(c.size(), 3);
 }
 
 // --------------------------------------------------------------------