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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
activity
/
SynchroExec.hpp
diff --git
a/src/kernel/activity/SynchroExec.hpp
b/src/kernel/activity/SynchroExec.hpp
index
b9747b8
..
d669494
100644
(file)
--- a/
src/kernel/activity/SynchroExec.hpp
+++ b/
src/kernel/activity/SynchroExec.hpp
@@
-7,12
+7,13
@@
#define _SIMIX_SYNCHRO_EXEC_HPP
#include "surf/surf.h"
#define _SIMIX_SYNCHRO_EXEC_HPP
#include "surf/surf.h"
-#include "src/kernel/activity/
Synchro.h
"
+#include "src/kernel/activity/
ActivityImpl.hpp
"
namespace simgrid {
namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace activity {
- XBT_PUBLIC_CLASS Exec : public
Synchro
{
+ XBT_PUBLIC_CLASS Exec : public
ActivityImpl
{
~Exec() override;
public:
Exec(const char*name, sg_host_t host);
~Exec() override;
public:
Exec(const char*name, sg_host_t host);
@@
-25,5
+26,5
@@
namespace simix {
surf_action_t surf_exec = nullptr; /* The Surf execution action encapsulated */
};
surf_action_t surf_exec = nullptr; /* The Surf execution action encapsulated */
};
-}}
// namespace simgrid::simix
+}}
} // namespace simgrid::kernel::activity
#endif
#endif