X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43d5e0b63aa3e781f8326674a7de4860b9df1366..be6e8d3215d3e25f48c7d2d0b359cf178f978d41:/src/bindings/java/JavaContext.cpp diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp index 12ebf6a42a..51ae35bcf9 100644 --- a/src/bindings/java/JavaContext.cpp +++ b/src/bindings/java/JavaContext.cpp @@ -41,10 +41,10 @@ JavaContext* JavaContextFactory::self() } JavaContext* JavaContextFactory::create_context( - xbt_main_func_t code, int argc, char ** argv, + std::function code, void_pfn_smxprocess_t cleanup, smx_process_t process) { - return this->new_context(code, argc, argv, cleanup, process); + return this->new_context(std::move(code), cleanup, process); } void JavaContextFactory::run_all() @@ -58,18 +58,17 @@ void JavaContextFactory::run_all() } -JavaContext::JavaContext(xbt_main_func_t code, - int argc, char **argv, +JavaContext::JavaContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t process) - : Context(code, argc, argv, cleanup_func, process) + : Context(std::move(code), cleanup_func, process) { static int thread_amount=0; thread_amount++; /* If the user provided a function for the process then use it otherwise is the context for maestro */ - if (code) { + if (has_code()) { this->jprocess = nullptr; this->begin = xbt_os_sem_init(0); this->end = xbt_os_sem_init(0);