mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-02-23 10:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix generator

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-04-22 13:35:01 +09:00
parent 74e0c8acd6
commit ba3d7d74b0
5 changed files with 79 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
sprout/generator/generated_value.hpp
View file

@ -9,60 +9,60 @@
#include <sprout/adl/not_found.hpp> #include <sprout/adl/not_found.hpp>
namespace sprout_adl { namespace sprout_adl {
sprout::not_found_via_adl generated_value(...); sprout::not_found_via_adl get_generated_value(...);
} // namespace sprout_adl } // namespace sprout_adl
namespace sprout_generator_detail { namespace sprout_generator_detail {
using sprout_adl::generated_value; using sprout_adl::get_generated_value;
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::generated_value(std::declval<Gen&>())) inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::get_generated_value(std::declval<Gen&>()))
generated_value(Gen& gen) get_generated_value(Gen& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::generated_value(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::get_generated_value(std::declval<Gen&>())))
{ {
return sprout::generators::generator_access_traits<Gen>::generated_value(gen); return sprout::generators::generator_access_traits<Gen>::get_generated_value(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR typename std::enable_if< inline SPROUT_CONSTEXPR typename std::enable_if<
!std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value, !std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value,
decltype(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::generated_value(std::declval<Gen&&>())) decltype(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::get_generated_value(std::declval<Gen&&>()))
>::type >::type
generated_value(Gen&& gen) get_generated_value(Gen&& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::generated_value(std::declval<Gen&&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::get_generated_value(std::declval<Gen&&>())))
{ {
return sprout::generators::generator_access_traits<Gen>::generated_value(gen); return sprout::generators::generator_access_traits<Gen>::get_generated_value(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen const>::generated_value(std::declval<Gen const&>())) inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen const>::get_generated_value(std::declval<Gen const&>()))
generated_value(Gen const& gen) get_generated_value(Gen const& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen const>::generated_value(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen const>::get_generated_value(std::declval<Gen const&>())))
{ {
return sprout::generators::generator_access_traits<Gen const>::generated_value(gen); return sprout::generators::generator_access_traits<Gen const>::get_generated_value(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(generated_value(std::declval<Gen&>())) inline SPROUT_CONSTEXPR decltype(get_generated_value(std::declval<Gen&>()))
call_generated_value(Gen& gen) call_get_generated_value(Gen& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(generated_value(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_generated_value(std::declval<Gen&>())))
{ {
return generated_value(gen); return get_generated_value(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR typename std::enable_if< inline SPROUT_CONSTEXPR typename std::enable_if<
!std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value, !std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value,
decltype(generated_value(std::declval<Gen&&>())) decltype(get_generated_value(std::declval<Gen&&>()))
>::type >::type
call_generated_value(Gen&& gen) call_get_generated_value(Gen&& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(generated_value(std::declval<Gen&&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_generated_value(std::declval<Gen&&>())))
{ {
return generated_value(gen); return get_generated_value(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(generated_value(std::declval<Gen const&>())) inline SPROUT_CONSTEXPR decltype(get_generated_value(std::declval<Gen const&>()))
call_generated_value(Gen const& gen) call_get_generated_value(Gen const& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(generated_value(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_generated_value(std::declval<Gen const&>())))
{ {
return generated_value(gen); return get_generated_value(gen);
} }
} // namespace sprout_generator_detail } // namespace sprout_generator_detail
@ -72,11 +72,11 @@ namespace sprout {
// generated_value // generated_value
// //
template<typename T> template<typename T>
inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_generated_value(std::declval<T>())) inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_get_generated_value(std::declval<T>()))
generated_value(T&& t) generated_value(T&& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_generated_value(std::declval<T>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_get_generated_value(std::declval<T>())))
{ {
return sprout_generator_detail::call_generated_value(sprout::forward<T>(t)); return sprout_generator_detail::call_get_generated_value(sprout::forward<T>(t));
} }
} // namespace generators } // namespace generators

40
sprout/generator/generator_access_traits.hpp
View file

@ -40,19 +40,19 @@ namespace sprout {
> { > {
public: public:
static SPROUT_CONSTEXPR decltype(std::declval<Gen&>().generated_value()) static SPROUT_CONSTEXPR decltype(std::declval<Gen&>().generated_value())
generated_value(Gen& t) get_generated_value(Gen& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&>().generated_value())) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&>().generated_value()))
{ {
return t.generated_value(); return t.generated_value();
} }
static SPROUT_CONSTEXPR decltype(std::declval<Gen&&>().generated_value()) static SPROUT_CONSTEXPR decltype(std::declval<Gen&&>().generated_value())
generated_value(Gen&& t) get_generated_value(Gen&& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&&>().generated_value())) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&&>().generated_value()))
{ {
return t.generated_value(); return t.generated_value();
} }
static SPROUT_CONSTEXPR decltype(std::declval<Gen const&>().generated_value()) static SPROUT_CONSTEXPR decltype(std::declval<Gen const&>().generated_value())
generated_value(Gen const& t) get_generated_value(Gen const& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen const&>().generated_value())) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen const&>().generated_value()))
{ {
return t.generated_value(); return t.generated_value();
@ -65,19 +65,19 @@ namespace sprout {
> { > {
public: public:
static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval<Gen&>())) static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval<Gen&>()))
generated_value(Gen& t) get_generated_value(Gen& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval<Gen&>())))
{ {
return sprout::tuples::get<0>(t); return sprout::tuples::get<0>(t);
} }
static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval<Gen&&>())) static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval<Gen&&>()))
generated_value(Gen&& t) get_generated_value(Gen&& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval<Gen&>())))
{ {
return sprout::tuples::get<0>(t); return sprout::tuples::get<0>(t);
} }
static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval<Gen const&>())) static SPROUT_CONSTEXPR decltype(sprout::tuples::get<0>(std::declval<Gen const&>()))
generated_value(Gen const& t) get_generated_value(Gen const& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<0>(std::declval<Gen const&>())))
{ {
return sprout::tuples::get<0>(t); return sprout::tuples::get<0>(t);
@ -115,19 +115,19 @@ namespace sprout {
> { > {
public: public:
static SPROUT_CONSTEXPR decltype(std::declval<Gen&>().next_generator()) static SPROUT_CONSTEXPR decltype(std::declval<Gen&>().next_generator())
next_generator(Gen& t) get_next_generator(Gen& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&>().next_generator())) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&>().next_generator()))
{ {
return t.next_generator(); return t.next_generator();
} }
static SPROUT_CONSTEXPR decltype(std::declval<Gen&&>().next_generator()) static SPROUT_CONSTEXPR decltype(std::declval<Gen&&>().next_generator())
next_generator(Gen&& t) get_next_generator(Gen&& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&&>().next_generator())) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen&&>().next_generator()))
{ {
return t.next_generator(); return t.next_generator();
} }
static SPROUT_CONSTEXPR decltype(std::declval<Gen const&>().next_generator()) static SPROUT_CONSTEXPR decltype(std::declval<Gen const&>().next_generator())
next_generator(Gen const& t) get_next_generator(Gen const& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen const&>().next_generator())) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(std::declval<Gen const&>().next_generator()))
{ {
return t.next_generator(); return t.next_generator();
@ -140,19 +140,19 @@ namespace sprout {
> { > {
public: public:
static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval<Gen&>())) static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval<Gen&>()))
next_generator(Gen& t) get_next_generator(Gen& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval<Gen&>())))
{ {
return sprout::tuples::get<1>(t); return sprout::tuples::get<1>(t);
} }
static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval<Gen&&>())) static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval<Gen&&>()))
next_generator(Gen&& t) get_next_generator(Gen&& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval<Gen&>())))
{ {
return sprout::tuples::get<1>(t); return sprout::tuples::get<1>(t);
} }
static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval<Gen const&>())) static SPROUT_CONSTEXPR decltype(sprout::tuples::get<1>(std::declval<Gen const&>()))
next_generator(Gen const& t) get_next_generator(Gen const& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::tuples::get<1>(std::declval<Gen const&>())))
{ {
return sprout::tuples::get<1>(t); return sprout::tuples::get<1>(t);
@ -171,17 +171,17 @@ namespace sprout {
template<typename Gen> template<typename Gen>
struct generator_access_traits<Gen const> { struct generator_access_traits<Gen const> {
public: public:
static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::generated_value(std::declval<Gen const&>())) static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::get_generated_value(std::declval<Gen const&>()))
generated_value(Gen const& t) get_generated_value(Gen const& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::generated_value(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::get_generated_value(std::declval<Gen const&>())))
{ {
return sprout::generators::generator_access_traits<Gen>::generated_value(t); return sprout::generators::generator_access_traits<Gen>::get_generated_value(t);
} }
static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::next_generator(std::declval<Gen const&>())) static SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::get_next_generator(std::declval<Gen const&>()))
next_generator(Gen const& t) get_next_generator(Gen const& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::next_generator(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::get_next_generator(std::declval<Gen const&>())))
{ {
return sprout::generators::generator_access_traits<Gen>::next_generator(t); return sprout::generators::generator_access_traits<Gen>::get_next_generator(t);
} }
}; };
} // namespace generators } // namespace generators

58
sprout/generator/next_generator.hpp
View file

@ -9,60 +9,60 @@
#include <sprout/adl/not_found.hpp> #include <sprout/adl/not_found.hpp>
namespace sprout_adl { namespace sprout_adl {
sprout::not_found_via_adl next_generator(...); sprout::not_found_via_adl get_next_generator(...);
} // namespace sprout_adl } // namespace sprout_adl
namespace sprout_generator_detail { namespace sprout_generator_detail {
using sprout_adl::next_generator; using sprout_adl::get_next_generator;
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::next_generator(std::declval<Gen&>())) inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen>::get_next_generator(std::declval<Gen&>()))
next_generator(Gen& gen) get_next_generator(Gen& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::next_generator(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen>::get_next_generator(std::declval<Gen&>())))
{ {
return sprout::generators::generator_access_traits<Gen>::next_generator(gen); return sprout::generators::generator_access_traits<Gen>::get_next_generator(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR typename std::enable_if< inline SPROUT_CONSTEXPR typename std::enable_if<
!std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value, !std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value,
decltype(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::next_generator(std::declval<Gen&&>())) decltype(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::get_next_generator(std::declval<Gen&&>()))
>::type >::type
next_generator(Gen&& gen) get_next_generator(Gen&& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::next_generator(std::declval<Gen&&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<typename std::remove_reference<Gen>::type>::get_next_generator(std::declval<Gen&&>())))
{ {
return sprout::generators::generator_access_traits<Gen>::next_generator(gen); return sprout::generators::generator_access_traits<Gen>::get_next_generator(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen const>::next_generator(std::declval<Gen const&>())) inline SPROUT_CONSTEXPR decltype(sprout::generators::generator_access_traits<Gen const>::get_next_generator(std::declval<Gen const&>()))
next_generator(Gen const& gen) get_next_generator(Gen const& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen const>::next_generator(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::generators::generator_access_traits<Gen const>::get_next_generator(std::declval<Gen const&>())))
{ {
return sprout::generators::generator_access_traits<Gen const>::next_generator(gen); return sprout::generators::generator_access_traits<Gen const>::get_next_generator(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(next_generator(std::declval<Gen&>())) inline SPROUT_CONSTEXPR decltype(get_next_generator(std::declval<Gen&>()))
call_next_generator(Gen& gen) call_get_next_generator(Gen& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(next_generator(std::declval<Gen&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_next_generator(std::declval<Gen&>())))
{ {
return next_generator(gen); return get_next_generator(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR typename std::enable_if< inline SPROUT_CONSTEXPR typename std::enable_if<
!std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value, !std::is_const<Gen>::value && !std::is_volatile<Gen>::value && !std::is_reference<Gen>::value,
decltype(next_generator(std::declval<Gen&&>())) decltype(get_next_generator(std::declval<Gen&&>()))
>::type >::type
call_next_generator(Gen&& gen) call_get_next_generator(Gen&& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(next_generator(std::declval<Gen&&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_next_generator(std::declval<Gen&&>())))
{ {
return next_generator(gen); return get_next_generator(gen);
} }
template<typename Gen> template<typename Gen>
inline SPROUT_CONSTEXPR decltype(next_generator(std::declval<Gen const&>())) inline SPROUT_CONSTEXPR decltype(get_next_generator(std::declval<Gen const&>()))
call_next_generator(Gen const& gen) call_get_next_generator(Gen const& gen)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(next_generator(std::declval<Gen const&>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(get_next_generator(std::declval<Gen const&>())))
{ {
return next_generator(gen); return get_next_generator(gen);
} }
} // namespace sprout_generator_detail } // namespace sprout_generator_detail
@ -72,11 +72,11 @@ namespace sprout {
// next_generator // next_generator
// //
template<typename T> template<typename T>
inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_next_generator(std::declval<T>())) inline SPROUT_CONSTEXPR decltype(sprout_generator_detail::call_get_next_generator(std::declval<T>()))
next_generator(T&& t) next_generator(T&& t)
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_next_generator(std::declval<T>()))) SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout_generator_detail::call_get_next_generator(std::declval<T>())))
{ {
return sprout_generator_detail::call_next_generator(sprout::forward<T>(t)); return sprout_generator_detail::call_get_next_generator(sprout::forward<T>(t));
} }
} // namespace generators } // namespace generators

29
sprout/random/random_result.hpp
View file

@ -7,6 +7,7 @@
#include <type_traits> #include <type_traits>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/iterator/next.hpp> #include <sprout/iterator/next.hpp>
#include <sprout/generator.hpp>
#include <sprout/utility/swap.hpp> #include <sprout/utility/swap.hpp>
namespace sprout { namespace sprout {
@ -284,34 +285,6 @@ namespace sprout {
iterator_next(sprout::random::random_result<Engine, Distribution> const& it) { iterator_next(sprout::random::random_result<Engine, Distribution> const& it) {
return it(); return it();
} }
//
// generated_value
//
template<typename Engine, typename Distribution>
inline typename sprout::random::random_result<Engine, Distribution>::result_type&
generated_value(sprout::random::random_result<Engine, Distribution>& t) {
return t.generated_value();
}
template<typename Engine, typename Distribution>
inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution>::result_type const&
generated_value(sprout::random::random_result<Engine, Distribution> const& t) {
return t.generated_value();
}
//
// next_generator
//
template<typename Engine, typename Distribution>
inline typename sprout::random::random_result<Engine, Distribution>&
next_generator(sprout::random::random_result<Engine, Distribution>& t) {
return t.next_generator();
}
template<typename Engine, typename Distribution>
inline SPROUT_CONSTEXPR typename sprout::random::random_result<Engine, Distribution> const&
next_generator(sprout::random::random_result<Engine, Distribution> const& t) {
return t.next_generator();
}
} // namespace random } // namespace random
using sprout::random::random_result; using sprout::random::random_result;

3
sprout/tuple/tuple/get.hpp
View file

@ -12,9 +12,6 @@
#include <sprout/tuple/tuple/tuple_access_traits.hpp> #include <sprout/tuple/tuple/tuple_access_traits.hpp>
#include <sprout/adl/not_found.hpp> #include <sprout/adl/not_found.hpp>
//#include <tuple>
//#include <sprout/type_traits/enabler_if.hpp>
namespace sprout { namespace sprout {
namespace tuples { namespace tuples {
namespace detail { namespace detail {