diff --git a/sprout/generator/generated_value.hpp b/sprout/generator/generated_value.hpp index 187875f6..9149f147 100644 --- a/sprout/generator/generated_value.hpp +++ b/sprout/generator/generated_value.hpp @@ -9,60 +9,60 @@ #include namespace sprout_adl { - sprout::not_found_via_adl generated_value(...); + sprout::not_found_via_adl get_generated_value(...); } // namespace sprout_adl namespace sprout_generator_detail { - using sprout_adl::generated_value; + using sprout_adl::get_generated_value; template - inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::generated_value(std::declval())) - generated_value(Gen& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::generated_value(std::declval()))) + inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::get_generated_value(std::declval())) + get_generated_value(Gen& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::get_generated_value(std::declval()))) { - return sprout::generators::generator_access_traits::generated_value(gen); + return sprout::generators::generator_access_traits::get_generated_value(gen); } template inline SPROUT_CONSTEXPR typename std::enable_if< !std::is_const::value && !std::is_volatile::value && !std::is_reference::value, - decltype(sprout::generators::generator_access_traits::type>::generated_value(std::declval())) + decltype(sprout::generators::generator_access_traits::type>::get_generated_value(std::declval())) >::type - generated_value(Gen&& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::type>::generated_value(std::declval()))) + get_generated_value(Gen&& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::type>::get_generated_value(std::declval()))) { - return sprout::generators::generator_access_traits::generated_value(gen); + return sprout::generators::generator_access_traits::get_generated_value(gen); } template - inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::generated_value(std::declval())) - generated_value(Gen const& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::generated_value(std::declval()))) + inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::get_generated_value(std::declval())) + get_generated_value(Gen const& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::get_generated_value(std::declval()))) { - return sprout::generators::generator_access_traits::generated_value(gen); + return sprout::generators::generator_access_traits::get_generated_value(gen); } template - inline SPROUT_CONSTEXPR decltype(generated_value(std::declval())) - call_generated_value(Gen& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(generated_value(std::declval()))) + inline SPROUT_CONSTEXPR decltype(get_generated_value(std::declval())) + call_get_generated_value(Gen& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_generated_value(std::declval()))) { - return generated_value(gen); + return get_generated_value(gen); } template inline SPROUT_CONSTEXPR typename std::enable_if< !std::is_const::value && !std::is_volatile::value && !std::is_reference::value, - decltype(generated_value(std::declval())) + decltype(get_generated_value(std::declval())) >::type - call_generated_value(Gen&& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(generated_value(std::declval()))) + call_get_generated_value(Gen&& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_generated_value(std::declval()))) { - return generated_value(gen); + return get_generated_value(gen); } template - inline SPROUT_CONSTEXPR decltype(generated_value(std::declval())) - call_generated_value(Gen const& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(generated_value(std::declval()))) + inline SPROUT_CONSTEXPR decltype(get_generated_value(std::declval())) + call_get_generated_value(Gen const& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_generated_value(std::declval()))) { - return generated_value(gen); + return get_generated_value(gen); } } // namespace sprout_generator_detail @@ -72,11 +72,11 @@ namespace sprout { // generated_value // template - inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_generated_value(std::declval())) + inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_get_generated_value(std::declval())) generated_value(T&& t) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_generated_value(std::declval()))) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_get_generated_value(std::declval()))) { - return sprout_generator_detail::call_generated_value(sprout::forward(t)); + return sprout_generator_detail::call_get_generated_value(sprout::forward(t)); } } // namespace generators diff --git a/sprout/generator/generator_access_traits.hpp b/sprout/generator/generator_access_traits.hpp index 94177be5..abe5f585 100644 --- a/sprout/generator/generator_access_traits.hpp +++ b/sprout/generator/generator_access_traits.hpp @@ -40,19 +40,19 @@ namespace sprout { > { public: static SPROUT_CONSTEXPR decltype(std::declval().generated_value()) - generated_value(Gen& t) + get_generated_value(Gen& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval().generated_value())) { return t.generated_value(); } static SPROUT_CONSTEXPR decltype(std::declval().generated_value()) - generated_value(Gen&& t) + get_generated_value(Gen&& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval().generated_value())) { return t.generated_value(); } static SPROUT_CONSTEXPR decltype(std::declval().generated_value()) - generated_value(Gen const& t) + get_generated_value(Gen const& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval().generated_value())) { return t.generated_value(); @@ -65,19 +65,19 @@ namespace sprout { > { public: static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval())) - generated_value(Gen& t) + get_generated_value(Gen& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval()))) { return sprout::tuples::get<0>(t); } static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval())) - generated_value(Gen&& t) + get_generated_value(Gen&& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval()))) { return sprout::tuples::get<0>(t); } static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval())) - generated_value(Gen const& t) + get_generated_value(Gen const& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval()))) { return sprout::tuples::get<0>(t); @@ -115,19 +115,19 @@ namespace sprout { > { public: static SPROUT_CONSTEXPR decltype(std::declval().next_generator()) - next_generator(Gen& t) + get_next_generator(Gen& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval().next_generator())) { return t.next_generator(); } static SPROUT_CONSTEXPR decltype(std::declval().next_generator()) - next_generator(Gen&& t) + get_next_generator(Gen&& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval().next_generator())) { return t.next_generator(); } static SPROUT_CONSTEXPR decltype(std::declval().next_generator()) - next_generator(Gen const& t) + get_next_generator(Gen const& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval().next_generator())) { return t.next_generator(); @@ -140,19 +140,19 @@ namespace sprout { > { public: static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval())) - next_generator(Gen& t) + get_next_generator(Gen& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval()))) { return sprout::tuples::get<1>(t); } static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval())) - next_generator(Gen&& t) + get_next_generator(Gen&& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval()))) { return sprout::tuples::get<1>(t); } static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval())) - next_generator(Gen const& t) + get_next_generator(Gen const& t) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval()))) { return sprout::tuples::get<1>(t); @@ -171,17 +171,17 @@ namespace sprout { template struct generator_access_traits { public: - static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::generated_value(std::declval())) - generated_value(Gen const& t) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::generated_value(std::declval()))) + static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::get_generated_value(std::declval())) + get_generated_value(Gen const& t) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::get_generated_value(std::declval()))) { - return sprout::generators::generator_access_traits::generated_value(t); + return sprout::generators::generator_access_traits::get_generated_value(t); } - static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::next_generator(std::declval())) - next_generator(Gen const& t) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::next_generator(std::declval()))) + static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::get_next_generator(std::declval())) + get_next_generator(Gen const& t) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::get_next_generator(std::declval()))) { - return sprout::generators::generator_access_traits::next_generator(t); + return sprout::generators::generator_access_traits::get_next_generator(t); } }; } // namespace generators diff --git a/sprout/generator/next_generator.hpp b/sprout/generator/next_generator.hpp index f2f4ee98..676a3e48 100644 --- a/sprout/generator/next_generator.hpp +++ b/sprout/generator/next_generator.hpp @@ -9,60 +9,60 @@ #include namespace sprout_adl { - sprout::not_found_via_adl next_generator(...); + sprout::not_found_via_adl get_next_generator(...); } // namespace sprout_adl namespace sprout_generator_detail { - using sprout_adl::next_generator; + using sprout_adl::get_next_generator; template - inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::next_generator(std::declval())) - next_generator(Gen& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::next_generator(std::declval()))) + inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::get_next_generator(std::declval())) + get_next_generator(Gen& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::get_next_generator(std::declval()))) { - return sprout::generators::generator_access_traits::next_generator(gen); + return sprout::generators::generator_access_traits::get_next_generator(gen); } template inline SPROUT_CONSTEXPR typename std::enable_if< !std::is_const::value && !std::is_volatile::value && !std::is_reference::value, - decltype(sprout::generators::generator_access_traits::type>::next_generator(std::declval())) + decltype(sprout::generators::generator_access_traits::type>::get_next_generator(std::declval())) >::type - next_generator(Gen&& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::type>::next_generator(std::declval()))) + get_next_generator(Gen&& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::type>::get_next_generator(std::declval()))) { - return sprout::generators::generator_access_traits::next_generator(gen); + return sprout::generators::generator_access_traits::get_next_generator(gen); } template - inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::next_generator(std::declval())) - next_generator(Gen const& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::next_generator(std::declval()))) + inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits::get_next_generator(std::declval())) + get_next_generator(Gen const& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits::get_next_generator(std::declval()))) { - return sprout::generators::generator_access_traits::next_generator(gen); + return sprout::generators::generator_access_traits::get_next_generator(gen); } template - inline SPROUT_CONSTEXPR decltype(next_generator(std::declval())) - call_next_generator(Gen& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(next_generator(std::declval()))) + inline SPROUT_CONSTEXPR decltype(get_next_generator(std::declval())) + call_get_next_generator(Gen& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_next_generator(std::declval()))) { - return next_generator(gen); + return get_next_generator(gen); } template inline SPROUT_CONSTEXPR typename std::enable_if< !std::is_const::value && !std::is_volatile::value && !std::is_reference::value, - decltype(next_generator(std::declval())) + decltype(get_next_generator(std::declval())) >::type - call_next_generator(Gen&& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(next_generator(std::declval()))) + call_get_next_generator(Gen&& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_next_generator(std::declval()))) { - return next_generator(gen); + return get_next_generator(gen); } template - inline SPROUT_CONSTEXPR decltype(next_generator(std::declval())) - call_next_generator(Gen const& gen) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(next_generator(std::declval()))) + inline SPROUT_CONSTEXPR decltype(get_next_generator(std::declval())) + call_get_next_generator(Gen const& gen) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_next_generator(std::declval()))) { - return next_generator(gen); + return get_next_generator(gen); } } // namespace sprout_generator_detail @@ -72,11 +72,11 @@ namespace sprout { // next_generator // template - inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_next_generator(std::declval())) + inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_get_next_generator(std::declval())) next_generator(T&& t) - SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_next_generator(std::declval()))) + SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_get_next_generator(std::declval()))) { - return sprout_generator_detail::call_next_generator(sprout::forward(t)); + return sprout_generator_detail::call_get_next_generator(sprout::forward(t)); } } // namespace generators diff --git a/sprout/random/random_result.hpp b/sprout/random/random_result.hpp index 6fd0e89c..e18d351a 100644 --- a/sprout/random/random_result.hpp +++ b/sprout/random/random_result.hpp @@ -7,6 +7,7 @@ #include #include #include +#include #include namespace sprout { @@ -284,34 +285,6 @@ namespace sprout { iterator_next(sprout::random::random_result const& it) { return it(); } - - // - // generated_value - // - template - inline typename sprout::random::random_result::result_type& - generated_value(sprout::random::random_result& t) { - return t.generated_value(); - } - template - inline SPROUT_CONSTEXPR typename sprout::random::random_result::result_type const& - generated_value(sprout::random::random_result const& t) { - return t.generated_value(); - } - - // - // next_generator - // - template - inline typename sprout::random::random_result& - next_generator(sprout::random::random_result& t) { - return t.next_generator(); - } - template - inline SPROUT_CONSTEXPR typename sprout::random::random_result const& - next_generator(sprout::random::random_result const& t) { - return t.next_generator(); - } } // namespace random using sprout::random::random_result; diff --git a/sprout/tuple/tuple/get.hpp b/sprout/tuple/tuple/get.hpp index d0f6022a..6fcf27a6 100644 --- a/sprout/tuple/tuple/get.hpp +++ b/sprout/tuple/tuple/get.hpp @@ -12,9 +12,6 @@ #include #include -//#include -//#include - namespace sprout { namespace tuples { namespace detail {