King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

fix index_range implementation

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-03-31 15:14:10 +09:00
parent 331aaa3559
commit 049d4592c2
78 changed files with 178 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sprout/tuple/tuple/hash.hpp
View file

@ -26,7 +26,7 @@ namespace sprout {
hash_value(sprout::tuples::tuple<Types...> const& v) {
return sprout::tuples::detail::tuple_hash_value_impl(
v,
sprout::index_range<0, sprout::tuples::tuple_size<sprout::tuples::tuple<Types...> >::value>::make()
sprout::make_index_tuple<sizeof...(Types)>::make()
);
}
} // namespace tuples

11
sprout/tuple/tuple/make_tuple.hpp
View file

@ -7,6 +7,7 @@
#include <sprout/utility/forward.hpp>
#include <sprout/tuple/tuple/tuple.hpp>
#include <sprout/tuple/tuple/get.hpp>
#include <sprout/tuple/indexes.hpp>
namespace sprout {
namespace tuples {
@ -57,7 +58,7 @@ namespace sprout {
};
public:
typedef typename make<
Tuple, typename sprout::index_range<0, sprout::tuples::tuple_size<Tuple>::value>::type
Tuple, typename sprout::tuple_indexes<Tuple>::type
>::type type;
};
template<typename T, typename U, typename... Tuples>
@ -76,8 +77,8 @@ namespace sprout {
public:
typedef typename sprout::tuples::result_of::detail::tuple_cat_impl<
typename make<
T, typename sprout::index_range<0, sprout::tuples::tuple_size<T>::value>::type,
U, typename sprout::index_range<0, sprout::tuples::tuple_size<U>::value>::type
T, typename sprout::tuple_indexes<T>::type,
U, typename sprout::tuple_indexes<U>::type
>::type,
Tuples...
>::type type;
@ -104,9 +105,7 @@ namespace sprout {
};
template<typename Head, typename... Tail>
struct tuple_cat_1st_indexes<Head, Tail...>
: public sprout::index_range<
0, sprout::tuples::tuple_size<typename std::remove_reference<Head>::type>::value
>
: public sprout::tuple_indexes<typename std::remove_reference<Head>::type>
{};
template<typename Result, typename IndexTuple, typename... Tuples>

2
sprout/tuple/tuple/tuple_decl.hpp
View file

@ -264,7 +264,7 @@ namespace sprout {
template<typename... UTypes>
struct is_flexibly_convert_constructible
: public is_flexibly_convert_constructible_impl<
typename sprout::index_range<0, (sizeof...(UTypes) < sizeof...(Types) ? sizeof...(UTypes) : sizeof...(Types))>::type,
typename sprout::make_index_tuple<(sizeof...(UTypes) < sizeof...(Types) ? sizeof...(UTypes) : sizeof...(Types))>::type,
UTypes...
>
{};