From 8dab81e59bf65e22f58e19ff5b29d791c61fce19 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 7 Sep 2017 23:38:26 +0200 Subject: [PATCH] [DEV] remove STL --- jvm-basics/jvm-basics.cpp | 10 +++++----- jvm-basics/jvm-basics.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jvm-basics/jvm-basics.cpp b/jvm-basics/jvm-basics.cpp index a646732..d0f55ba 100644 --- a/jvm-basics/jvm-basics.cpp +++ b/jvm-basics/jvm-basics.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -17,8 +17,8 @@ JavaVM*& jvm_basics::getJavaVM() { static JavaVM* g_JavaVM=nullptr; // global acces on the unique JVM !!! return g_JavaVM; } -std::mutex& jvm_basics::getMutexJavaVM() { - static std::mutex g_jvmMutex; +ethread::Mutex& jvm_basics::getMutexJavaVM() { + static ethread::Mutex g_jvmMutex; return g_jvmMutex; } @@ -34,14 +34,14 @@ extern "C" { // JNI onLoad JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* _jvm, void* _reserved) { // get the java virtual machine handle ... - std::unique_lock lock(jvm_basics::getMutexJavaVM()); + std::unique_lock lock(jvm_basics::getMutexJavaVM()); jvm_basics::getJavaVM() = _jvm; JVMB_INFO("JNI-> load the jvm ..." ); return JNI_VERSION_1_6; } // JNI onUnLoad JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* _vm, void *_reserved) { - std::unique_lock lock(jvm_basics::getMutexJavaVM()); + std::unique_lock lock(jvm_basics::getMutexJavaVM()); jvm_basics::getJavaVM() = nullptr; JVMB_INFO("JNI-> Un-load the jvm ..." ); } diff --git a/jvm-basics/jvm-basics.hpp b/jvm-basics/jvm-basics.hpp index dddb184..951201b 100644 --- a/jvm-basics/jvm-basics.hpp +++ b/jvm-basics/jvm-basics.hpp @@ -7,7 +7,7 @@ namespace jvm_basics { JavaVM*& getJavaVM(); - std::mutex& getMutexJavaVM(); + ethread::Mutex& getMutexJavaVM(); void checkExceptionJavaVM(JNIEnv* _env); }