diff options
| author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
|---|---|---|
| committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
| commit | 98b34cb0dbf5c50d7f319724c93021418140b15f (patch) | |
| tree | 11cd51f86b5c672dda6bfe087f40f77df1553971 /platform/android/src/geometry/lat_lng_quad.hpp | |
| parent | ee17d79f9420eb859303d977955454dacc470db6 (diff) | |
| parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
| download | qtlocation-mapboxgl-98b34cb0dbf5c50d7f319724c93021418140b15f.tar.gz | |
Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017
# Conflicts:
# cmake/mason-dependencies.cmake
Diffstat (limited to 'platform/android/src/geometry/lat_lng_quad.hpp')
| -rw-r--r-- | platform/android/src/geometry/lat_lng_quad.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/platform/android/src/geometry/lat_lng_quad.hpp b/platform/android/src/geometry/lat_lng_quad.hpp index 8f8c9abeef..f6560b57ba 100644 --- a/platform/android/src/geometry/lat_lng_quad.hpp +++ b/platform/android/src/geometry/lat_lng_quad.hpp @@ -15,14 +15,11 @@ public: static constexpr auto Name() { return "com/mapbox/mapboxsdk/geometry/LatLngQuad"; }; - static jni::Object<LatLngQuad> New(jni::JNIEnv&, std::array<mbgl::LatLng, 4>); + static jni::Local<jni::Object<LatLngQuad>> New(jni::JNIEnv&, std::array<mbgl::LatLng, 4>); - static std::array<mbgl::LatLng, 4> getLatLngArray(jni::JNIEnv&, jni::Object<LatLngQuad>); - - static jni::Class<LatLngQuad> javaClass; + static std::array<mbgl::LatLng, 4> getLatLngArray(jni::JNIEnv&, const jni::Object<LatLngQuad>&); static void registerNative(jni::JNIEnv&); - }; |