fix generics

margelo · Feb 21, 2024 · 7ae941a · 7ae941a
1 parent 0234630
commit 7ae941a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 23 deletions.
diff --git a/package/android/src/main/cpp/AndroidFilamentProxy.h b/package/android/src/main/cpp/AndroidFilamentProxy.h
@@ -19,7 +19,7 @@ using namespace facebook;
 class AndroidFilamentProxy : public FilamentProxy {
 public:
   explicit AndroidFilamentProxy(jni::alias_ref<JFilamentProxy::javaobject> filamentProxy);
-  ~AndroidFilamentProxy() override;
+  ~AndroidFilamentProxy();
 
 private:
   // TODO(hanno): implement

diff --git a/package/android/src/main/cpp/AndroidSurface.h b/package/android/src/main/cpp/AndroidSurface.h
@@ -19,7 +19,7 @@ using namespace facebook;
 class AndroidSurface : public Surface {
 public:
   explicit AndroidSurface(jni::alias_ref<jobject> javaSurface);
-  ~AndroidSurface() override;
+  ~AndroidSurface();
 
   void* getSurface() override;
   int getWidth() override;

diff --git a/package/android/src/main/cpp/JNISharedPtr.cpp b/package/android/src/main/cpp/JNISharedPtr.cpp
@@ -6,16 +6,5 @@
 
 namespace margelo {
 
-void GlobalRefDeleter::operator()(jni::global_ref<jobject>* ref) {
-  if (ref) {
-    ref->release();
-    delete ref;
-  }
-}
-
-template <typename T, typename std::enable_if<std::is_base_of<jni::HybridClass<T>, T>::value>::type*>
-std::shared_ptr<T> JNISharedPtr::make_shared_from_jni(jni::global_ref<typename T::javaobject> ref) {
-  return std::shared_ptr<T>(ref->cthis(), GlobalRefDeleter{});
-}
 
 } // namespace margelo
diff --git a/package/android/src/main/cpp/JNISharedPtr.h b/package/android/src/main/cpp/JNISharedPtr.h
@@ -11,14 +11,25 @@ namespace margelo {
 
 using namespace facebook;
 
+template<typename T>
 struct GlobalRefDeleter {
-  void operator()(jni::global_ref<jobject>* ref);
+  explicit GlobalRefDeleter(jni::global_ref<typename T::javaobject> ref): _ref(ref) {}
+
+  void operator()(T* _) {
+      if (_ref) {
+          _ref.release();
+      }
+  }
+private:
+    jni::global_ref<typename T::javaobject> _ref;
 };
 
 class JNISharedPtr {
 public:
   template <typename T, typename std::enable_if<std::is_base_of<jni::HybridClass<T>, T>::value>::type* = nullptr>
-  static std::shared_ptr<T> make_shared_from_jni(jni::global_ref<typename T::javaobject> ref);
+  static std::shared_ptr<T> make_shared_from_jni(jni::global_ref<typename T::javaobject> ref) {
+      return std::shared_ptr<T>(ref->cthis(), GlobalRefDeleter<T> {ref});
+  }
 };
 
 } // namespace margelo
diff --git a/package/cpp/FilamentProxy.h b/package/cpp/FilamentProxy.h
@@ -16,9 +16,6 @@ namespace margelo {
 using namespace facebook;
 
 class FilamentProxy : public jsi::HostObject {
-public:
-  virtual ~FilamentProxy() = 0;
-
 private:
   virtual int loadModel(const std::string& path) = 0;
   virtual std::shared_ptr<FilamentView> findFilamentView(int id) = 0;

diff --git a/package/cpp/FilamentView.h b/package/cpp/FilamentView.h
@@ -15,9 +15,6 @@ namespace margelo {
 using namespace facebook;
 
 class FilamentView {
-public:
-  virtual ~FilamentView() = 0;
-
 public:
   virtual const SurfaceProvider& getSurfaceProvider() = 0;
 };

diff --git a/package/cpp/Surface.h b/package/cpp/Surface.h
@@ -11,8 +11,6 @@ namespace margelo {
 
 class Surface {
 public:
-  virtual ~Surface() = 0;
-
   /**
    * Returns the surface ("native window") that can be used as a render target.
    * On Android, this is a `ANativeWindow*`, on iOS it is a `CAMetalLayer*`.