diff --git a/sprout/random/binomial_distribution.hpp b/sprout/random/binomial_distribution.hpp index e8c4fec8..a24a5220 100644 --- a/sprout/random/binomial_distribution.hpp +++ b/sprout/random/binomial_distribution.hpp @@ -229,7 +229,7 @@ namespace sprout { } template SPROUT_CXX14_CONSTEXPR result_type - generate(Engine& eng) const { + generate_cxx14(Engine& eng) const { for (; ; ) { RealType u = RealType(); RealType v = static_cast(sprout::random::uniform_01()(eng)); @@ -750,8 +750,8 @@ namespace sprout { return use_inversion() ? RealType(0.5) < p_ ? t_ - invert(t_, 1 - p_, eng) : invert(t_, p_, eng) - : RealType(0.5) < p_ ? t_ - generate(eng) - : generate(eng) + : RealType(0.5) < p_ ? t_ - generate_cxx14(eng) + : generate_cxx14(eng) ; } template diff --git a/sprout/random/uniform_int_distribution.hpp b/sprout/random/uniform_int_distribution.hpp index 05f3b783..58a5bdd3 100644 --- a/sprout/random/uniform_int_distribution.hpp +++ b/sprout/random/uniform_int_distribution.hpp @@ -34,7 +34,7 @@ namespace sprout { template inline SPROUT_CXX14_CONSTEXPR T - generate_uniform_int( + generate_uniform_int_cxx14( Engine& eng, T min_value, T max_value, std::true_type ) { @@ -73,7 +73,7 @@ namespace sprout { } mult *= range_type(brange) + range_type(1); } - range_type result_increment = sprout::random::detail::generate_uniform_int( + range_type result_increment = sprout::random::detail::generate_uniform_int_cxx14( eng, static_cast(0), static_cast(range / mult), @@ -112,12 +112,12 @@ namespace sprout { } template inline SPROUT_CXX14_CONSTEXPR T - generate_uniform_int( + generate_uniform_int_cxx14( Engine& eng, T min_value, T max_value, std::false_type ) { sprout::random::detail::uniform_int_float wrapper(eng); - return sprout::random::detail::generate_uniform_int(wrapper, min_value, max_value, std::true_type()); + return sprout::random::detail::generate_uniform_int_cxx14(wrapper, min_value, max_value, std::true_type()); } template inline SPROUT_CXX14_CONSTEXPR T @@ -125,7 +125,7 @@ namespace sprout { Engine& eng, T min_value, T max_value ) { - return sprout::random::detail::generate_uniform_int( + return sprout::random::detail::generate_uniform_int_cxx14( eng, min_value, max_value, std::is_integral() );