coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2025-12-06 16:56:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert util::tuple* to std::tuple*

Browse Source
This commit is contained in:
Denis Blank 2018-02-05 22:50:15 +01:00
parent cd2af2d49a
commit 7d0e68ad9b
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/continuable/detail/pack-traversal-async.hpp
View File

@ -40,7 +40,6 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <continuable/continuable-api.hpp>
#include <continuable/detail/container-category.hpp> #include <continuable/detail/container-category.hpp>
namespace cti { namespace cti {
@ -242,10 +241,9 @@ struct static_async_range<Target, Begin, Begin> {
}; };
/// Returns a static range for the given type /// Returns a static range for the given type
template <typename T, template <typename T, typename Range = static_async_range<
typename Range = static_async_range< typename std::decay<T>::type, 0U,
typename std::decay<T>::type, 0U, std::tuple_size<typename std::decay<T>::type>::value>>
util::tuple_size<typename std::decay<T>::type>::value>>
Range make_static_range(T&& element) { Range make_static_range(T&& element) {
auto pointer = std::addressof(element); auto pointer = std::addressof(element);
return Range{pointer}; return Range{pointer};
@ -291,11 +289,12 @@ Range make_dynamic_async_range(T&& element) {
template <typename Frame, typename... Hierarchy> template <typename Frame, typename... Hierarchy>
class async_traversal_point { class async_traversal_point {
Frame frame_; Frame frame_;
tuple<Hierarchy...> hierarchy_; std::tuple<Hierarchy...> hierarchy_;
bool& detached_; bool& detached_;
public: public:
explicit async_traversal_point(Frame frame, tuple<Hierarchy...> hierarchy, explicit async_traversal_point(Frame frame,
std::tuple<Hierarchy...> hierarchy,
bool& detached) bool& detached)
: frame_(std::move(frame)), hierarchy_(std::move(hierarchy)), : frame_(std::move(frame)), hierarchy_(std::move(hierarchy)),
detached_(detached) { detached_(detached) {
@ -319,8 +318,8 @@ public:
Hierarchy...> { Hierarchy...> {
// Create a new hierarchy which contains the // Create a new hierarchy which contains the
// the parent (the last traversed element). // the parent (the last traversed element).
auto hierarchy = util::tuple_cat( auto hierarchy = std::tuple_cat(
util::make_tuple(std::forward<Parent>(parent)), hierarchy_); std::make_tuple(std::forward<Parent>(parent)), hierarchy_);
return async_traversal_point<Frame, typename std::decay<Parent>::type, return async_traversal_point<Frame, typename std::decay<Parent>::type,
Hierarchy...>(frame_, std::move(hierarchy), Hierarchy...>(frame_, std::move(hierarchy),
@ -359,7 +358,7 @@ public:
// Store the current call hierarchy into a tuple for // Store the current call hierarchy into a tuple for
// later re-entrance. // later re-entrance.
auto hierarchy = auto hierarchy =
util::tuple_cat(util::make_tuple(current.next()), hierarchy_); std::tuple_cat(util::make_tuple(current.next()), hierarchy_);
// First detach the current execution context // First detach the current execution context
detach(); detach();

1
include/continuable/detail/pack-traversal.hpp
View File

@ -38,7 +38,6 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <continuable/continuable-api.hpp>
#include <continuable/detail/container-category.hpp> #include <continuable/detail/container-category.hpp>
namespace cti { namespace cti {