Skip to content

Commit 340466b

Browse files
committed
std::initializer_list を取るオーバーロードの戻り値を auto に変更
1 parent f7914be commit 340466b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Siv3D/include/Siv3D/DiscreteDistribution.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ namespace s3d
9292

9393
template <class Type, class URBG>
9494
[[nodiscard]]
95-
inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg);
95+
inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg);
9696

9797
template <class Type>
9898
[[nodiscard]]
99-
inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight);
99+
inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight);
100100
}
101101

102102
# include "detail/DiscreteDistribution.ipp"

Siv3D/include/Siv3D/detail/DiscreteDistribution.ipp

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ namespace s3d
106106
}
107107

108108
template <class Type, class URBG>
109-
inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg)
109+
inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight, URBG&& urbg)
110110
{
111111
assert(ilist.size() != 0);
112112
return *(ilist.begin() + weight(std::forward<URBG>(urbg)));
113113
}
114114

115115
template <class Type>
116-
inline decltype(auto) DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight)
116+
inline auto DiscreteSample(std::initializer_list<Type> ilist, DiscreteDistribution& weight)
117117
{
118118
return DiscreteSample(ilist, weight, GetDefaultRNG());
119119
}

0 commit comments

Comments
 (0)