-/* Copyright (c) 2016. The SimGrid Team.
+/* Copyright (c) 2016-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
FutureStateBase(FutureStateBase const&) = delete;
FutureStateBase& operator=(FutureStateBase const&) = delete;
- XBT_PUBLIC(void) schedule(simgrid::xbt::Task<void()>&& job);
+ XBT_PUBLIC void schedule(simgrid::xbt::Task<void()>&& job);
void set_exception(std::exception_ptr exception)
{
* You are not expected to use them directly but to create them
* implicitely through a @ref simgrid::kernel::Promise.
* Alternatively kernel operations could inherit or contain FutureState
- * if they are managed with @ref std::shared_ptr.
+ * if they are managed with std::shared_ptr.
**/
template<class T>
class FutureState : public FutureStateBase {
xbt_assert(this->value_);
T* result = value_;
value_ = nullptr;
- return *value_;
+ return *result;
}
private:
template<class T>
void bindPromise(Promise<T> promise, Future<T> future)
{
- struct PromiseBinder {
+ class PromiseBinder {
public:
explicit PromiseBinder(Promise<T> promise) : promise_(std::move(promise)) {}
void operator()(Future<T> future)
* );
* </pre>
*
- * This is based on C++1z @ref std::future but with some differences:
+ * This is based on C++1z std::future but with some differences:
*
* * there is no thread synchronization (atomic, mutex, condition variable,
* etc.) because everything happens in the SimGrid event loop;
/** Get the value from the future
*
* The future must be valid and ready in order to make this call.
- * @ref std::future blocks when the future is not ready but we are
+ * std::future blocks when the future is not ready but we are
* completely single-threaded so blocking would be a deadlock.
* After the call, the future becomes invalid.
*
* A @ref Promise is connected to some `Future` and can be used to
* set its result.
*
- * Similar to @ref std::promise
+ * Similar to std::promise
*
* <code>
* // Create a promise and a future:
template<class T>
class Promise {
public:
- explicit Promise() : state_(std::make_shared<FutureState<T>>()) {}
+ Promise() : state_(std::make_shared<FutureState<T>>()) {}
explicit Promise(std::shared_ptr<FutureState<T>> state) : state_(std::move(state)) {}
// Move type
class Promise<void> {
public:
Promise() : state_(std::make_shared<FutureState<void>>()) {}
- Promise(std::shared_ptr<FutureState<void>> state) : state_(std::move(state)) {}
+ explicit Promise(std::shared_ptr<FutureState<void>> state) : state_(std::move(state)) {}
~Promise()
{
if (state_ && state_->get_status() == FutureStatus::not_ready)
