MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-04 06:38:58 +02:00
Code Issues Releases Wiki Activity

ircd::util: Fixes to constexpr tuple utils.

Browse source
This commit is contained in:
Jason Volk 2017-08-23 14:57:58 -06:00
parent 9ea5eceb0e
commit 3d536d26b6
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/ircd/util.h
View file

@ -198,7 +198,7 @@ typename std::enable_if<(i > 0), void>::type
rfor_each(const std::tuple<args...> &t, rfor_each(const std::tuple<args...> &t,
func&& f) func&& f)
{ {
f(std::get<i - i>(t)); f(std::get<i - 1>(t));
rfor_each<i - 1>(t, std::forward<func>(f)); rfor_each<i - 1>(t, std::forward<func>(f));
} }
@ -210,7 +210,7 @@ typename std::enable_if<(i > 0), void>::type
rfor_each(std::tuple<args...> &t, rfor_each(std::tuple<args...> &t,
func&& f) func&& f)
{ {
f(std::get<i - i>(t)); f(std::get<i - 1>(t));
rfor_each<i - 1>(t, std::forward<func>(f)); rfor_each<i - 1>(t, std::forward<func>(f));
} }
@ -222,7 +222,7 @@ typename std::enable_if<(i == -1), void>::type
rfor_each(const std::tuple<args...> &t, rfor_each(const std::tuple<args...> &t,
func&& f) func&& f)
{ {
constexpr const auto size constexpr const ssize_t size
{ {
std::tuple_size<std::tuple<args...>>::value std::tuple_size<std::tuple<args...>>::value
}; };
@ -238,7 +238,7 @@ typename std::enable_if<(i == -1), void>::type
rfor_each(std::tuple<args...> &t, rfor_each(std::tuple<args...> &t,
func&& f) func&& f)
{ {
constexpr const auto size constexpr const ssize_t size
{ {
std::tuple_size<std::tuple<args...>>::value std::tuple_size<std::tuple<args...>>::value
}; };
@ -280,7 +280,8 @@ typename std::enable_if<i < std::tuple_size<std::tuple<args...>>::value, bool>::
until(std::tuple<args...> &t, until(std::tuple<args...> &t,
func&& f) func&& f)
{ {
return f(std::get<i>(t))? until<i+1>(t, std::forward<func>(f)) : false; using value_type = typename std::tuple_element<i, std::tuple<args...>>::type;
return f(static_cast<value_type &>(std::get<i>(t)))? until<i+1>(t, f) : false;
} }
template<size_t i = 0, template<size_t i = 0,
@ -291,10 +292,10 @@ typename std::enable_if<i < std::tuple_size<std::tuple<args...>>::value, bool>::
until(const std::tuple<args...> &t, until(const std::tuple<args...> &t,
func&& f) func&& f)
{ {
return f(std::get<i>(t))? until<i+1>(t, std::forward<func>(f)) : false; using value_type = typename std::tuple_element<i, std::tuple<args...>>::type;
return f(static_cast<const value_type &>(std::get<i>(t)))? until<i+1>(t, f) : false;
} }
// //
// Circuits for reverse iteration of a tuple // Circuits for reverse iteration of a tuple
// //
@ -330,7 +331,7 @@ typename std::enable_if<(i > 0), bool>::type
runtil(const std::tuple<args...> &t, runtil(const std::tuple<args...> &t,
func&& f) func&& f)
{ {
return f(std::get<i - i>(t))? runtil<i - 1>(t, std::forward<func>(f)) : false; return f(std::get<i - 1>(t))? runtil<i - 1>(t, f) : false;
} }
template<ssize_t i, template<ssize_t i,
@ -341,7 +342,7 @@ typename std::enable_if<(i > 0), bool>::type
runtil(std::tuple<args...> &t, runtil(std::tuple<args...> &t,
func&& f) func&& f)
{ {
return f(std::get<i - i>(t))? runtil<i - 1>(t, std::forward<func>(f)) : false; return f(std::get<i - 1>(t))? runtil<i - 1>(t, f) : false;
} }
template<ssize_t i = -1, template<ssize_t i = -1,
@ -396,7 +397,6 @@ for_each(const std::function<void (const Enum &)> &func)
func(static_cast<Enum>(i)); func(static_cast<Enum>(i));
} }
/** /**
* flag-enum utilities * flag-enum utilities
* *