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
Move some C++ helpers in xbt/
[simgrid.git]
/
src
/
simix
/
libsmx.cpp
diff --git
a/src/simix/libsmx.cpp
b/src/simix/libsmx.cpp
index
115a0e8
..
794909f
100644
(file)
--- a/
src/simix/libsmx.cpp
+++ b/
src/simix/libsmx.cpp
@@
-15,6
+15,8
@@
#include <functional>
#include <functional>
+#include <xbt/functional.hpp>
+
#include "src/mc/mc_replay.h"
#include "smx_private.h"
#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_replay.h"
#include "smx_private.h"
#include "src/mc/mc_forward.hpp"
@@
-377,7
+379,7
@@
smx_process_t simcall_process_create(const char *name,
{
if (name == nullptr)
name = "";
{
if (name == nullptr)
name = "";
- auto wrapped_code = simgrid::
simix::wrap_m
ain(code, argc, argv);
+ auto wrapped_code = simgrid::
xbt::wrapM
ain(code, argc, argv);
for (int i = 0; i != argc; ++i)
xbt_free(argv[i]);
xbt_free(argv);
for (int i = 0; i != argc; ++i)
xbt_free(argv[i]);
xbt_free(argv);
@@
-1126,7
+1128,7
@@
xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
void simcall_run_kernel(std::function<void()> const& code)
{
void simcall_run_kernel(std::function<void()> const& code)
{
- return simcall_BODY_run_kernel(
(void*)
&code);
+ return simcall_BODY_run_kernel(&code);
}
int simcall_mc_random(int min, int max) {
}
int simcall_mc_random(int min, int max) {