Merge pull request #94 from CaseyCarter/move-only-readable

iterators that return move-only types by value should satisfy Readable
CaseyCarter · Apr 4, 2017 · 82bdd8d · 82bdd8d
2 parents 1aa042d + 9419a6c
commit 82bdd8d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/include/stl2/detail/iterator/concepts.hpp b/include/stl2/detail/iterator/concepts.hpp
@@ -166,9 +166,9 @@ STL2_OPEN_NAMESPACE {
 				typename rvalue_reference_t<I>;
 			} &&
 			// Relationships between associated types
-			CommonReference<reference_t<I>, value_type_t<I>&>() &&
-			CommonReference<reference_t<I>, rvalue_reference_t<I>>() &&
-			CommonReference<rvalue_reference_t<I>, const value_type_t<I>&>();
+			CommonReference<reference_t<I>&&, value_type_t<I>&>() &&
+			CommonReference<reference_t<I>&&, rvalue_reference_t<I>&&>() &&
+			CommonReference<rvalue_reference_t<I>&&, const value_type_t<I>&>();
 	}
 
 	namespace models {

diff --git a/test/concepts/iterator.cpp b/test/concepts/iterator.cpp
@@ -198,6 +198,14 @@ namespace readable_test {
 	CONCEPT_ASSERT(models::Readable<const int*>);
 	CONCEPT_ASSERT(models::Readable<A>);
 	CONCEPT_ASSERT(models::Same<ns::value_type_t<A>,int>);
+
+	struct MoveOnlyReadable
+	{
+		using value_type = std::unique_ptr<int>;
+		value_type operator*() const;
+	};
+
+	CONCEPT_ASSERT(models::Readable<MoveOnlyReadable>);
 }
 
 namespace writable_test {