Update DataTable

morzhovets · Jul 18, 2024 · ed5aedf · ed5aedf
1 parent 6cfda0e
commit ed5aedf
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/include/momo/DataTable.h b/include/momo/DataTable.h
@@ -748,7 +748,7 @@ class DataTable
 	}
 
 	template<typename... Items>
-	internal::EnableIf<(sizeof...(Items) > 1),
+	internal::EnableIf<(sizeof...(Items) != 1),
 	ConstSelection> Select(Equality<Items>... equals) const
 	{
 		return pvSelect<Selection>(EmptyRowFilter(), equals...);
@@ -764,14 +764,13 @@ class DataTable
 	template<typename RowFilter = EmptyRowFilter,
 		typename... Items>
 	internal::EnableIf<internal::IsInvocable<const RowFilter&, bool, ConstRowReference>::value,
-	ConstSelection> Select(Equalities<Items...> equals = {},
-		const RowFilter& rowFilter = RowFilter()) const
+	ConstSelection> Select(Equalities<Items...> equals, const RowFilter& rowFilter = RowFilter()) const
 	{
 		return pvSelect<Selection>(equals, rowFilter);
 	}
 
 	template<typename... Items>
-	internal::EnableIf<(sizeof...(Items) > 1),
+	internal::EnableIf<(sizeof...(Items) != 1),
 	Selection> Select(Equality<Items>... equals)
 	{
 		return pvSelect<Selection>(EmptyRowFilter(), equals...);
@@ -787,13 +786,13 @@ class DataTable
 	template<typename RowFilter = EmptyRowFilter,
 		typename... Items>
 	internal::EnableIf<internal::IsInvocable<const RowFilter&, bool, ConstRowReference>::value,
-	Selection> Select(Equalities<Items...> equals = {}, const RowFilter& rowFilter = RowFilter())
+	Selection> Select(Equalities<Items...> equals, const RowFilter& rowFilter = RowFilter())
 	{
 		return pvSelect<Selection>(equals, rowFilter);
 	}
 
 	template<typename... Items>
-	internal::EnableIf<(sizeof...(Items) > 1),
+	internal::EnableIf<(sizeof...(Items) != 1),
 	size_t> SelectCount(Equality<Items>... equals) const
 	{
 		return pvSelect<size_t>(EmptyRowFilter(), equals...);
@@ -809,8 +808,7 @@ class DataTable
 	template<typename RowFilter = EmptyRowFilter,
 		typename... Items>
 	internal::EnableIf<internal::IsInvocable<const RowFilter&, bool, ConstRowReference>::value,
-	size_t> SelectCount(Equalities<Items...> equals = {},
-		const RowFilter& rowFilter = RowFilter()) const
+	size_t> SelectCount(Equalities<Items...> equals, const RowFilter& rowFilter = RowFilter()) const
 	{
 		return pvSelect<size_t>(equals, rowFilter);
 	}
@@ -1368,12 +1366,6 @@ class DataTable
 			VersionKeeper(&mCrew.GetRemoveVersion()));
 	}
 
-	template<typename Result, typename RowFilter>	// vs2015
-	Result pvSelect(const Equalities<>& /*equals*/, const RowFilter& rowFilter) const
-	{
-		return pvSelect<Result>(rowFilter);
-	}
-
 	template<typename Result, typename... Items, typename RowFilter>
 	Result pvSelect(const Equalities<Items...>& equals, const RowFilter& rowFilter) const
 	{