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
[SMPI] Renamed default SMPI instance for smpirun
[simgrid.git]
/
include
/
xbt
/
future.hpp
diff --git
a/include/xbt/future.hpp
b/include/xbt/future.hpp
index
4972da2
..
55abdc7
100644
(file)
--- a/
include/xbt/future.hpp
+++ b/
include/xbt/future.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-201
6
. The SimGrid Team.
+/* Copyright (c) 2015-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-14,6
+14,7
@@
#include <stdexcept>
#include <type_traits>
#include <utility>
#include <stdexcept>
#include <type_traits>
#include <utility>
+#include <xbt/ex.h>
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
@@
-33,7
+34,7
@@
class Result {
exception,
};
public:
exception,
};
public:
- Result()
= default;
+ Result()
{ /* Nothing to do */}
~Result() { this->reset(); }
// Copy (if T is copyable) and move:
~Result() { this->reset(); }
// Copy (if T is copyable) and move:
@@
-47,12
+48,14
@@
public:
switch (that.status_) {
case ResultStatus::invalid:
break;
switch (that.status_) {
case ResultStatus::invalid:
break;
- case ResultStatus::val
id
:
+ case ResultStatus::val
ue
:
new (&value_) T(that.value);
break;
case ResultStatus::exception:
new (&exception_) T(that.exception);
break;
new (&value_) T(that.value);
break;
case ResultStatus::exception:
new (&exception_) T(that.exception);
break;
+ default:
+ THROW_IMPOSSIBLE;
}
return *this;
}
}
return *this;
}
@@
-66,7
+69,7
@@
public:
switch (that.status_) {
case ResultStatus::invalid:
break;
switch (that.status_) {
case ResultStatus::invalid:
break;
- case ResultStatus::val
id
:
+ case ResultStatus::val
ue
:
new (&value_) T(std::move(that.value));
that.value.~T();
break;
new (&value_) T(std::move(that.value));
that.value.~T();
break;
@@
-74,6
+77,8
@@
public:
new (&exception_) T(std::move(that.exception));
that.exception.~exception_ptr();
break;
new (&exception_) T(std::move(that.exception));
that.exception.~exception_ptr();
break;
+ default:
+ THROW_IMPOSSIBLE;
}
that.status_ = ResultStatus::invalid;
return *this;
}
that.status_ = ResultStatus::invalid;
return *this;
@@
-94,6
+99,8
@@
public:
case ResultStatus::exception:
exception_.~exception_ptr();
break;
case ResultStatus::exception:
exception_.~exception_ptr();
break;
+ default:
+ THROW_IMPOSSIBLE;
}
status_ = ResultStatus::invalid;
}
}
status_ = ResultStatus::invalid;
}
@@
-123,9
+130,6
@@
public:
T get()
{
switch (status_) {
T get()
{
switch (status_) {
- case ResultStatus::invalid:
- default:
- throw std::logic_error("Invalid result");
case ResultStatus::value: {
T value = std::move(value_);
value_.~T();
case ResultStatus::value: {
T value = std::move(value_);
value_.~T();
@@
-139,6
+143,8
@@
public:
std::rethrow_exception(std::move(exception));
break;
}
std::rethrow_exception(std::move(exception));
break;
}
+ default:
+ throw std::logic_error("Invalid result");
}
}
private:
}
}
private: