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
[simix] Fix extern 'C' error from clang
[simgrid.git]
/
src
/
simix
/
smx_private.h
diff --git
a/src/simix/smx_private.h
b/src/simix/smx_private.h
index
6906a08
..
1808c16
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-13,6
+13,7
@@
#include <xbt/functional.hpp>
#include <xbt/functional.hpp>
+
#include "src/internal_config.h"
#include "simgrid/simix.h"
#include "surf/surf.h"
#include "src/internal_config.h"
#include "simgrid/simix.h"
#include "surf/surf.h"
@@
-67,12
+68,6
@@
typedef struct s_smx_context_factory *smx_context_factory_t;
namespace simgrid {
namespace simix {
namespace simgrid {
namespace simix {
-// What's executed as SIMIX actor code:
-typedef std::function<void()> ActorCode;
-
-// Create ActorCode based on argv:
-typedef std::function<ActorCode(simgrid::xbt::args args)> ActorCodeFactory;
-
class Global {
public:
smx_context_factory_t context_factory = nullptr;
class Global {
public:
smx_context_factory_t context_factory = nullptr;
@@
-177,8
+172,8
@@
XBT_PRIVATE void SIMIX_post_create_environment(void);
// FIXME, Dirty hack for SMPI+MSG
XBT_PRIVATE void SIMIX_process_set_cleanup_function(smx_process_t process, void_pfn_smxprocess_t cleanup);
// FIXME, Dirty hack for SMPI+MSG
XBT_PRIVATE void SIMIX_process_set_cleanup_function(smx_process_t process, void_pfn_smxprocess_t cleanup);
-XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name);
-
SG_END_DECL()
SG_END_DECL()
+XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name);
+
#endif
#endif