-/* Copyright (c) 2016-2020. The SimGrid Team.
+/* Copyright (c) 2016-2021. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <xbt/base.h>
#include <xbt/functional.hpp>
-#include <xbt/future.hpp>
+#include <xbt/promise.hpp>
namespace simgrid {
namespace kernel {
*/
template <class F> auto then_no_unwrap(F continuation) -> Future<decltype(continuation(std::move(*this)))>
{
- typedef decltype(continuation(std::move(*this))) R;
+ using R = decltype(continuation(std::move(*this)));
if (state_ == nullptr)
throw std::future_error(std::future_errc::no_state);
auto state = std::move(state_);
* @exception std::future_error no state is associated with the future
*/
template <class F>
- auto then(F continuation) -> typename std::enable_if<not is_future<decltype(continuation(std::move(*this)))>::value,
- Future<decltype(continuation(std::move(*this)))>>::type
+ auto then(F continuation) -> typename std::enable_if_t<not is_future<decltype(continuation(std::move(*this)))>::value,
+ Future<decltype(continuation(std::move(*this)))>>
{
return this->then_no_unwrap(std::move(continuation));
}
/** Attach a continuation to this future (future chaining) */
- template<class F>
- auto then(F continuation)
- -> typename std::enable_if<
- is_future<decltype(continuation(std::move(*this)))>::value,
- decltype(continuation(std::move(*this)))
- >::type
+ template <class F>
+ auto then(F continuation) -> typename std::enable_if_t<is_future<decltype(continuation(std::move(*this)))>::value,
+ decltype(continuation(std::move(*this)))>
{
return unwrap_future(this->then_no_unwrap(std::move(continuation)));
}
}
private:
- std::shared_ptr<FutureState<T>> state_{new FutureState<T>()};
+ std::shared_ptr<FutureState<T>> state_ = std::make_shared<FutureState<T>>();
bool future_get_ = false;
};
}
private:
- std::shared_ptr<FutureState<void>> state_{new FutureState<void>()};
+ std::shared_ptr<FutureState<void>> state_ = std::make_shared<FutureState<void>>();
bool future_get_ = false;
};