A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics in the changelog and NEWS file [skip-ci]
[simgrid.git]
/
include
/
simgrid
/
kernel
/
future.hpp
diff --git
a/include/simgrid/kernel/future.hpp
b/include/simgrid/kernel/future.hpp
index 897e4c231adfb083b9235218648668f11b12860f..332cf19157818741b40231c8d8263e4718bc00ec 100644
(file)
--- a/
include/simgrid/kernel/future.hpp
+++ b/
include/simgrid/kernel/future.hpp
@@
-116,8
+116,7
@@
protected:
**/
void resolve()
{
**/
void resolve()
{
- if (status_ != FutureStatus::ready)
- xbt_die("Deadlock: this future is not ready");
+ xbt_assert(status_ == FutureStatus::ready, "Deadlock: this future is not ready");
status_ = FutureStatus::done;
if (exception_) {
std::exception_ptr exception = std::move(exception_);
status_ = FutureStatus::done;
if (exception_) {
std::exception_ptr exception = std::move(exception_);
@@
-414,7
+413,7
@@
template <class T> Future<T> unwrap_future(Future<Future<T>> future)
* auto promise = std::make_shared<simgrid::kernel::Promise<T>>();
* auto future = promise->get_future();
*
* auto promise = std::make_shared<simgrid::kernel::Promise<T>>();
* auto future = promise->get_future();
*
- * simgrid::
simix
::Timer::set(date, [promise] {
+ * simgrid::
kernel::timer
::Timer::set(date, [promise] {
* try {
* int value = compute_the_value();
* if (value < 0)
* try {
* int value = compute_the_value();
* if (value < 0)