std::initializer_list を取るオーバーロードの戻り値を auto に変更

Siv3D · Nov 26, 2024 · 340466b · 340466b
1 parent f7914be
commit 340466b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Siv3D/include/Siv3D/DiscreteDistribution.hpp b/Siv3D/include/Siv3D/DiscreteDistribution.hpp
@@ -92,11 +92,11 @@ namespace s3d
 
 	template <class Type, class URBG>
 	[[nodiscard]]
-	inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg);
+	inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg);
 
 	template <class Type>
 	[[nodiscard]]
-	inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight);
+	inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight);
 }
 
 # include "detail/DiscreteDistribution.ipp"
diff --git a/Siv3D/include/Siv3D/detail/DiscreteDistribution.ipp b/Siv3D/include/Siv3D/detail/DiscreteDistribution.ipp
@@ -106,14 +106,14 @@ namespace s3d
 	}
 
 	template <class Type, class URBG>
-	inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg)
+	inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg)
 	{
 		assert(ilist.size() != 0);
 		return *(ilist.begin() + weight(std::forward<URBG>(urbg)));
 	}
 
 	template <class Type>
-	inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight)
+	inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight)
 	{
 		return DiscreteSample(ilist, weight, GetDefaultRNG());
 	}