summaryrefslogtreecommitdiff
path: root/platform/android/src/gson/json_object.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-08-22 12:27:43 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-09-07 09:44:12 -0700
commit79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 (patch)
tree2b646523d45f0fa9917612ed80de12bbd35d5b1e /platform/android/src/gson/json_object.hpp
parent5911e3b13f2f2b6741e26db3e41513ed21cc95b4 (diff)
downloadqtlocation-mapboxgl-79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41.tar.gz
[android] jni.hpp 4.0.0
Diffstat (limited to 'platform/android/src/gson/json_object.hpp')
-rw-r--r--platform/android/src/gson/json_object.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/platform/android/src/gson/json_object.hpp b/platform/android/src/gson/json_object.hpp
index 256161f0d9..b8916f8ae1 100644
--- a/platform/android/src/gson/json_object.hpp
+++ b/platform/android/src/gson/json_object.hpp
@@ -8,12 +8,13 @@ namespace mbgl {
namespace android {
namespace gson {
-class JsonObject : public JsonElement {
+class JsonObject {
public:
+ using SuperTag = JsonElement;
static constexpr auto Name() { return "com/google/gson/JsonObject"; };
- static jni::Object<JsonObject> New(jni::JNIEnv&, const mbgl::PropertyMap&);
- static mbgl::PropertyMap convert(JNIEnv&, jni::Object<JsonObject>);
+ static jni::Local<jni::Object<JsonObject>> New(jni::JNIEnv&, const mbgl::PropertyMap&);
+ static mbgl::PropertyMap convert(JNIEnv&, const jni::Object<JsonObject>&);
static void registerNative(jni::JNIEnv&);
};