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
rename simix::kernelImmediate into simix::simcall
[simgrid.git]
/
src
/
simix
/
smx_private.hpp
diff --git
a/src/simix/smx_private.hpp
b/src/simix/smx_private.hpp
index
3609c1f
..
bcbb2f6
100644
(file)
--- a/
src/simix/smx_private.hpp
+++ b/
src/simix/smx_private.hpp
@@
-8,6
+8,7
@@
#include "simgrid/s4u/Actor.hpp"
#include "src/kernel/context/Context.hpp"
#include "simgrid/s4u/Actor.hpp"
#include "src/kernel/context/Context.hpp"
+#include <xbt/xbt_os_thread.h>
#include <unordered_map>
#include <vector>
#include <unordered_map>
#include <vector>
@@
-63,8
+64,6
@@
public:
}
}
}
}
-extern "C" {
-
XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
XBT_PUBLIC void SIMIX_clean();
XBT_PUBLIC_DATA std::unique_ptr<simgrid::simix::Global> simix_global;
XBT_PUBLIC void SIMIX_clean();
@@
-80,6
+79,5
@@
XBT_PUBLIC void SIMIX_clean();
_smx_throw_issuer->exception = std::make_exception_ptr(e); \
} else \
((void)0)
_smx_throw_issuer->exception = std::make_exception_ptr(e); \
} else \
((void)0)
-}
#endif
#endif