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
Remove xbt::args: use vector<string> instead
[simgrid.git]
/
include
/
simgrid
/
simix.hpp
diff --git
a/include/simgrid/simix.hpp
b/include/simgrid/simix.hpp
index
eb92f42
..
d08f865
100644
(file)
--- a/
include/simgrid/simix.hpp
+++ b/
include/simgrid/simix.hpp
@@
-13,7
+13,6
@@
#include <utility>
#include <memory>
#include <functional>
#include <utility>
#include <memory>
#include <functional>
-#include <future>
#include <xbt/function_types.h>
#include <xbt/future.hpp>
#include <xbt/function_types.h>
#include <xbt/future.hpp>
@@
-176,7
+175,7
@@
XBT_PUBLIC(void) create_maestro(std::function<void()> code);
typedef std::function<void()> ActorCode;
// Create ActorCode based on argv:
typedef std::function<void()> ActorCode;
// Create ActorCode based on argv:
-typedef std::function<ActorCode(s
imgrid::xbt::args
args)> ActorCodeFactory;
+typedef std::function<ActorCode(s
td::vector<std::string>
args)> ActorCodeFactory;
XBT_PUBLIC(void) registerFunction(const char* name, ActorCodeFactory factory);
XBT_PUBLIC(void) registerFunction(const char* name, ActorCodeFactory factory);
@@
-215,12
+214,12
@@
XBT_PUBLIC(smx_process_t) simcall_process_create(const char *name,
xbt_dict_t properties,
int auto_restart);
xbt_dict_t properties,
int auto_restart);
-XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, s
td::packaged_t
ask<void()> callback);
+XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, s
imgrid::xbt::T
ask<void()> callback);
template<class F> inline
XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, F callback)
{
template<class F> inline
XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, F callback)
{
- return SIMIX_timer_set(date, s
td::packaged_t
ask<void()>(std::move(callback)));
+ return SIMIX_timer_set(date, s
imgrid::xbt::T
ask<void()>(std::move(callback)));
}
template<class R, class T> inline
}
template<class R, class T> inline