diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-08 20:22:04 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-08 20:22:04 +1100 |
| commit | 81bf36a86cc92f92b8fb546946b4590dd8bdb885 (patch) | |
| tree | cb10cfc21aabee8cbc8e06e81a00542194666255 /android/cpp | |
| parent | d623c264f70977c385bb2b58fd137f477f3db46b (diff) | |
| download | qtlocation-mapboxgl-81bf36a86cc92f92b8fb546946b4590dd8bdb885.tar.gz | |
Remove Map::cleanup() from JNI
Diffstat (limited to 'android/cpp')
| -rw-r--r-- | android/cpp/jni.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp index 0fa7a8a10a..0f42e2cf5f 100644 --- a/android/cpp/jni.cpp +++ b/android/cpp/jni.cpp @@ -302,13 +302,6 @@ void JNICALL nativeUpdate(JNIEnv* env, jobject obj, jlong nativeMapViewPtr) { COFFEE_TRY_JNI(env, CPP_TRY_JNI(env, nativeMapView->getMap().update())); } -void JNICALL nativeCleanup(JNIEnv* env, jobject obj, jlong nativeMapViewPtr) { - mbgl::Log::Debug(mbgl::Event::JNI, "nativeCleanup"); - assert(nativeMapViewPtr != 0); - NativeMapView* nativeMapView = reinterpret_cast<NativeMapView*>(nativeMapViewPtr); - COFFEE_TRY_JNI(env, CPP_TRY_JNI(env, nativeMapView->getMap().cleanup())); -} - void JNICALL nativeTerminate(JNIEnv* env, jobject obj, jlong nativeMapViewPtr) { mbgl::Log::Debug(mbgl::Event::JNI, "nativeTerminate"); assert(nativeMapViewPtr != 0); @@ -833,7 +826,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { } // NOTE: if you get java.lang.UnsatisfiedLinkError you likely forgot to set the size of the array correctly (too large) - std::array<JNINativeMethod, 60> methods = {{ // Can remove the extra brace in C++14 + std::array<JNINativeMethod, 59> methods = {{ // Can remove the extra brace in C++14 { "nativeCreate", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J", reinterpret_cast<void*>(&nativeCreate) }, { "nativeDestroy", "(J)V", reinterpret_cast<void*>(&nativeDestroy) }, { "nativeInitializeDisplay", "(J)V", reinterpret_cast<void*>(&nativeInitializeDisplay) }, @@ -849,7 +842,6 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { { "nativeRun", "(J)V", reinterpret_cast<void*>(&nativeRun) }, { "nativeRerender", "(J)V", reinterpret_cast<void*>(&nativeRerender) }, { "nativeUpdate", "(J)V", reinterpret_cast<void*>(&nativeUpdate) }, - { "nativeCleanup", "(J)V", reinterpret_cast<void*>(&nativeCleanup) }, { "nativeTerminate", "(J)V", reinterpret_cast<void*>(&nativeTerminate) }, { "nativeNeedsSwap", "(J)Z", reinterpret_cast<void*>(&nativeNeedsSwap) }, { "nativeSwapped", "(J)V", reinterpret_cast<void*>(&nativeSwapped) }, |