From 12e4e9a1fd538aafa6a0df2de705041063740834 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 3 Oct 2017 22:39:07 +0200 Subject: [PATCH] Use std::replace instead of xbt_str_subst in C++ files. --- src/bindings/java/jmsg.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 09d41702e3..1bb1487fd6 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -5,7 +5,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include #include +#include #include "simgrid/msg.h" #include "simgrid/plugins/energy.h" @@ -269,9 +271,9 @@ static int java_main(int argc, char *argv[]) simgrid::kernel::context::JavaContext* context = static_cast(SIMIX_context_self()); //Change the "." in class name for "/". - xbt_str_subst(argv[0],'.','/',0); - jclass class_Process = env->FindClass(argv[0]); - xbt_str_subst(argv[0],'/','.',0); + std::string arg0 = argv[0]; + std::replace(begin(arg0), end(arg0), '.', '/'); + jclass class_Process = env->FindClass(arg0.c_str()); //Retrieve the methodID for the constructor xbt_assert((class_Process != nullptr), "Class not found (%s). The deployment file must use the fully qualified class name, including the package. The case is important.", argv[0]); jmethodID constructor_Process = env->GetMethodID(class_Process, "", "(Lorg/simgrid/msg/Host;Ljava/lang/String;[Ljava/lang/String;)V"); -- 2.20.1