DataEquality

include/momo/DataColumn.h

@@ -219,23 +219,24 @@ namespace internal
 template<typename... Columns>
 class DataEquality
 {
+private:
+	typedef std::tuple<DataEquality<Columns>...> Tuple;
+
 public:
 	DataEquality(std::pair<const Columns&,
 		const typename internal::DataColumnItemSelector<Columns>::Item&>... pairs) noexcept
 		: mTuple(pairs...)
 	{
 	}
 
-	DataEquality(DataEquality&&) = default;
-
 	DataEquality(const DataEquality&) = delete;
 
 	~DataEquality() noexcept = default;
 
 	DataEquality& operator=(const DataEquality&) = delete;
 
 	template<size_t index>
-	decltype(auto) Get() const noexcept
+	const std::tuple_element_t<index, Tuple>& Get() const noexcept
 	{
 		return std::get<index>(mTuple);
 	}
@@ -261,7 +262,7 @@ class DataEquality
 	}
 
 private:
-	std::tuple<DataEquality<Columns>...> mTuple;
+	Tuple mTuple;
 };
 
 template<typename Column>
@@ -282,8 +283,6 @@ class DataEquality<Column>
 	{
 	}
 
-	DataEquality(DataEquality&&) = default;
-
 	DataEquality(const DataEquality&) = delete;
 
 	~DataEquality() noexcept = default;