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/style/conversion/position.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/style/conversion/position.hpp')
| -rw-r--r-- | platform/android/src/style/conversion/position.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/style/conversion/position.hpp b/platform/android/src/style/conversion/position.hpp index 2ef4bf4395..90409d527d 100644 --- a/platform/android/src/style/conversion/position.hpp +++ b/platform/android/src/style/conversion/position.hpp @@ -11,8 +11,8 @@ namespace android { namespace conversion { template <> -struct Converter<jni::Object<Position>, mbgl::style::Position> { - Result<jni::Object<Position>> operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const; +struct Converter<jni::Local<jni::Object<Position>>, mbgl::style::Position> { + Result<jni::Local<jni::Object<Position>>> operator()(jni::JNIEnv &env, const mbgl::style::Position &value) const; }; template <> |