X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e95d2dda61913a92ff3a9d1b7c368ba6e1443b30..53300623ffc4a530dedcc517d559926ea0891edf:/src/bindings/java/jmsg_as.cpp diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp index 9c7935d003..2bf2499b39 100644 --- a/src/bindings/java/jmsg_as.cpp +++ b/src/bindings/java/jmsg_as.cpp @@ -1,6 +1,6 @@ /* Java bindings of the NetZones. */ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -16,8 +16,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); -extern "C" { - static jmethodID jas_method_As_constructor; static jfieldID jas_field_As_bind; @@ -58,7 +56,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv* env, jclass cl JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) { simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas); - return env->NewStringUTF(as->getCname()); + return env->NewStringUTF(as->get_cname()); } JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas) { @@ -143,11 +141,11 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jo for (auto const& host : table) { jhost = static_cast(host->extension(JAVA_HOST_LEVEL)); if (not jhost) { - jname = env->NewStringUTF(host->getCname()); + jname = env->NewStringUTF(host->get_cname()); jhost = Java_org_simgrid_msg_Host_getByName(env, cls, jname); - env->ReleaseStringUTFChars(static_cast(jname), host->getCname()); + env->ReleaseStringUTFChars(static_cast(jname), host->get_cname()); } env->SetObjectArrayElement(jtable, index, jhost); @@ -155,4 +153,3 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jo } return jtable; } -}