From 649f4a5630dfc718f04c80fc6be39e072227d4cc Mon Sep 17 00:00:00 2001
From: Stefan Karschti <stefan.karschti@gmail.com>
Date: Wed, 28 Feb 2024 19:16:03 +0200
Subject: [PATCH] Fix for C++ header in public Objective-C header (#2156)

---
 platform/darwin/app/ExampleCustomDrawableStyleLayer.mm | 4 ++++
 platform/darwin/src/MLNCustomDrawableStyleLayer.h      | 9 ---------
 platform/darwin/src/MLNCustomDrawableStyleLayer.mm     | 6 ++++++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm b/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm
index 49f0e3412..62cde00f0 100644
--- a/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm
+++ b/platform/darwin/app/ExampleCustomDrawableStyleLayer.mm
@@ -13,6 +13,10 @@
 #include <memory>
 #include <cmath>
 
+@interface MLNCustomDrawableStyleLayer (Internal)
+- (instancetype)initWithPendingLayer:(std::unique_ptr<mbgl::style::Layer>)pendingLayer;
+@end
+
 class ExampleCustomDrawableStyleLayerHost;
 
 @implementation ExampleCustomDrawableStyleLayer
diff --git a/platform/darwin/src/MLNCustomDrawableStyleLayer.h b/platform/darwin/src/MLNCustomDrawableStyleLayer.h
index b32d63a46..df671349c 100644
--- a/platform/darwin/src/MLNCustomDrawableStyleLayer.h
+++ b/platform/darwin/src/MLNCustomDrawableStyleLayer.h
@@ -6,15 +6,6 @@
 #import "MLNStyleLayer.h"
 #import "MLNGeometry.h"
 
-#ifdef __cplusplus
-#include <mbgl/style/layer.hpp>
-#endif
-
 MLN_EXPORT
 @interface MLNCustomDrawableStyleLayer : MLNStyleLayer
-
-#ifdef __cplusplus
-- (instancetype)initWithPendingLayer:(std::unique_ptr<mbgl::style::Layer>)pendingLayer;
-#endif
-
 @end
diff --git a/platform/darwin/src/MLNCustomDrawableStyleLayer.mm b/platform/darwin/src/MLNCustomDrawableStyleLayer.mm
index b8ddaae46..f91fd0190 100644
--- a/platform/darwin/src/MLNCustomDrawableStyleLayer.mm
+++ b/platform/darwin/src/MLNCustomDrawableStyleLayer.mm
@@ -12,6 +12,12 @@
 #include <memory>
 #include <cmath>
 
+#include <mbgl/style/layer.hpp>
+
+@interface MLNCustomDrawableStyleLayer (Internal)
+- (instancetype)initWithPendingLayer:(std::unique_ptr<mbgl::style::Layer>)pendingLayer;
+@end
+
 @implementation MLNCustomDrawableStyleLayer
 
 - (instancetype)initWithRawLayer:(mbgl::style::Layer *)rawLayer {