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
cosmetics
[simgrid.git]
/
src
/
kernel
/
context
/
ContextBoost.hpp
diff --git
a/src/kernel/context/ContextBoost.hpp
b/src/kernel/context/ContextBoost.hpp
index
957bd77
..
578fe10
100644
(file)
--- a/
src/kernel/context/ContextBoost.hpp
+++ b/
src/kernel/context/ContextBoost.hpp
@@
-33,7
+33,7
@@
protected: // static
static xbt_os_thread_key_t worker_id_key_;
static unsigned long process_index_;
static BoostContext* maestro_context_;
static xbt_os_thread_key_t worker_id_key_;
static unsigned long process_index_;
static BoostContext* maestro_context_;
-protected:
+
#if HAVE_BOOST_CONTEXTS == 1
boost::context::fcontext_t* fc_ = nullptr;
#else
#if HAVE_BOOST_CONTEXTS == 1
boost::context::fcontext_t* fc_ = nullptr;
#else
@@
-44,7
+44,7
@@
public:
friend BoostContextFactory;
BoostContext(std::function<void()> code,
void_pfn_smxprocess_t cleanup_func,
friend BoostContextFactory;
BoostContext(std::function<void()> code,
void_pfn_smxprocess_t cleanup_func,
- smx_
process
_t process);
+ smx_
actor
_t process);
~BoostContext() override;
virtual void resume();
private:
~BoostContext() override;
virtual void resume();
private:
@@
-60,7
+60,7
@@
public:
BoostContextFactory();
~BoostContextFactory() override;
Context* create_context(std::function<void()> code,
BoostContextFactory();
~BoostContextFactory() override;
Context* create_context(std::function<void()> code,
- void_pfn_smxprocess_t, smx_
process
_t process) override;
+ void_pfn_smxprocess_t, smx_
actor
_t process) override;
void run_all() override;
};
void run_all() override;
};