From 79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 22 Aug 2018 12:27:43 -0700
Subject: [android] jni.hpp 4.0.0

---
 platform/android/src/style/layers/circle_layer.hpp | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'platform/android/src/style/layers/circle_layer.hpp')

diff --git a/platform/android/src/style/layers/circle_layer.hpp b/platform/android/src/style/layers/circle_layer.hpp
index 03063b1fc1..0ff34094e1 100644
--- a/platform/android/src/style/layers/circle_layer.hpp
+++ b/platform/android/src/style/layers/circle_layer.hpp
@@ -12,12 +12,12 @@ namespace android {
 
 class CircleLayer : public Layer {
 public:
-
+    using SuperTag = Layer;
     static constexpr auto Name() { return "com/mapbox/mapboxsdk/style/layers/CircleLayer"; };
 
     static void registerNative(jni::JNIEnv&);
 
-    CircleLayer(jni::JNIEnv&, jni::String, jni::String);
+    CircleLayer(jni::JNIEnv&, jni::String&, jni::String&);
 
     CircleLayer(mbgl::Map&, mbgl::style::CircleLayer&);
 
@@ -27,44 +27,44 @@ public:
 
     // Properties
 
-    jni::Object<jni::ObjectTag> getCircleRadius(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleRadius(jni::JNIEnv&);
     void setCircleRadiusTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleRadiusTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleRadiusTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleColor(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleColor(jni::JNIEnv&);
     void setCircleColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleColorTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleColorTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleBlur(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleBlur(jni::JNIEnv&);
     void setCircleBlurTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleBlurTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleBlurTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleOpacity(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleOpacity(jni::JNIEnv&);
     void setCircleOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleOpacityTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleOpacityTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleTranslate(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleTranslate(jni::JNIEnv&);
     void setCircleTranslateTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleTranslateTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleTranslateTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleTranslateAnchor(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleTranslateAnchor(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCirclePitchScale(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCirclePitchScale(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCirclePitchAlignment(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCirclePitchAlignment(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleStrokeWidth(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleStrokeWidth(jni::JNIEnv&);
     void setCircleStrokeWidthTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleStrokeWidthTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleStrokeWidthTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleStrokeColor(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleStrokeColor(jni::JNIEnv&);
     void setCircleStrokeColorTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleStrokeColorTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleStrokeColorTransition(jni::JNIEnv&);
 
-    jni::Object<jni::ObjectTag> getCircleStrokeOpacity(jni::JNIEnv&);
+    jni::Local<jni::Object<jni::ObjectTag>> getCircleStrokeOpacity(jni::JNIEnv&);
     void setCircleStrokeOpacityTransition(jni::JNIEnv&, jlong duration, jlong delay);
-    jni::Object<TransitionOptions> getCircleStrokeOpacityTransition(jni::JNIEnv&);
-    jni::jobject* createJavaPeer(jni::JNIEnv&);
+    jni::Local<jni::Object<TransitionOptions>> getCircleStrokeOpacityTransition(jni::JNIEnv&);
+    jni::Local<jni::Object<Layer>> createJavaPeer(jni::JNIEnv&);
 
 }; // class CircleLayer
 
-- 
cgit v1.2.1