Make ActorImpl::context_ a std::unique_ptr.

[simgrid.git] / src / bindings / java / JavaContext.cpp

diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index 4dd0cc69501f452574d6a09084bd3dd2e869a24e..5d500af7b2c26652447f74faec319877b952e9dd 100644 (file)
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -29,12 +29,12 @@ ContextFactory* java_factory()
 
 JavaContextFactory::JavaContextFactory() : ContextFactory()
 {
-  xbt_binary_name = xbt_strdup("java"); // Used by the backtrace displayer
+  xbt_assert(xbt_binary_name && strcmp(xbt_binary_name, "java") == 0); // Set by Java_org_simgrid_msg_Msg_init
 }
 
 JavaContextFactory::~JavaContextFactory()=default;
 
-JavaContext* JavaContextFactory::create_context(std::function<void()> code, smx_actor_t actor)
+JavaContext* JavaContextFactory::create_context(std::function<void()>&& code, smx_actor_t actor)
 {
   return this->new_context<JavaContext>(std::move(code), actor);
 }
@@ -44,7 +44,7 @@ void JavaContextFactory::run_all()
   SerialThreadContext::run_all();
 }
 
-JavaContext::JavaContext(std::function<void()> code, smx_actor_t actor)
+JavaContext::JavaContext(std::function<void()>&& code, smx_actor_t actor)
     : SerialThreadContext(std::move(code), actor, false /* not maestro */)
 {
   /* ThreadContext already does all we need */