X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04cb8833befbe07b6b94ff0cae98bc17b78724e3..41f97f763bc1771fe15e96ffcd4ff3e7c76a9a63:/include/simgrid/kernel/future.hpp diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp index 777a9f48b2..e779c0ad63 100644 --- a/include/simgrid/kernel/future.hpp +++ b/include/simgrid/kernel/future.hpp @@ -1,4 +1,4 @@ -/* 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 @@ -48,7 +48,7 @@ public: FutureStateBase(FutureStateBase const&) = delete; FutureStateBase& operator=(FutureStateBase const&) = delete; - XBT_PUBLIC(void) schedule(simgrid::xbt::Task&& job); + XBT_PUBLIC void schedule(simgrid::xbt::Task&& job); void set_exception(std::exception_ptr exception) { @@ -137,7 +137,7 @@ private: * 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 FutureState : public FutureStateBase { @@ -181,7 +181,7 @@ public: xbt_assert(this->value_); T* result = value_; value_ = nullptr; - return *value_; + return *result; } private: @@ -207,9 +207,9 @@ public: template void bindPromise(Promise promise, Future future) { - struct PromiseBinder { + class PromiseBinder { public: - PromiseBinder(Promise promise) : promise_(std::move(promise)) {} + explicit PromiseBinder(Promise promise) : promise_(std::move(promise)) {} void operator()(Future future) { simgrid::xbt::setPromise(promise_, future); @@ -261,7 +261,7 @@ template Future unwrapFuture(Future> future); * ); * * - * 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; @@ -282,7 +282,7 @@ template class Future { public: Future() = default; - Future(std::shared_ptr> state) : state_(std::move(state)) {} + explicit Future(std::shared_ptr> state) : state_(std::move(state)) {} // Move type: Future(Future&) = delete; @@ -390,7 +390,7 @@ public: /** 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. * @@ -424,7 +424,7 @@ Future unwrapFuture(Future> future) * 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 * * * // Create a promise and a future: @@ -455,7 +455,7 @@ template class Promise { public: Promise() : state_(std::make_shared>()) {} - Promise(std::shared_ptr> state) : state_(std::move(state)) {} + explicit Promise(std::shared_ptr> state) : state_(std::move(state)) {} // Move type Promise(Promise const&) = delete; @@ -510,7 +510,7 @@ template<> class Promise { public: Promise() : state_(std::make_shared>()) {} - Promise(std::shared_ptr> state) : state_(std::move(state)) {} + explicit Promise(std::shared_ptr> state) : state_(std::move(state)) {} ~Promise() { if (state_ && state_->get_status() == FutureStatus::not_ready)