From 245823e47444ee52f26fdfadf49afc5959567f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Sun, 17 May 2015 00:11:45 -0700
Subject: [PATCH] =?UTF-8?q?Removed=20=E2=80=9Cprivate=E2=80=9D=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of exposing these methods in a private header that winds up triggering warnings publicly, just redeclare the methods in a category. Since this is a test app, we’ll catch any issues that arise from refactoring simply by testing.

Fixes #1579.
---
 include/mbgl/ios/private/MGLMapView_Private.h | 14 --------------
 ios/benchmark/MBXBenchViewController.mm       | 13 ++++++++++++-
 ios/benchmark/fo/benchmark-ios.gypi           |  1 -
 3 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 include/mbgl/ios/private/MGLMapView_Private.h

diff --git a/include/mbgl/ios/private/MGLMapView_Private.h b/include/mbgl/ios/private/MGLMapView_Private.h
deleted file mode 100644
index 18c07ef1b..000000000
--- a/include/mbgl/ios/private/MGLMapView_Private.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface MGLMapView ()
-
-#pragma mark - Debugging
-
-/** Triggers another render pass even when it is not necessary. */
-- (void)invalidate;
-
-/** Returns whether the map view is currently loading or processing any assets required to render the map */
-- (BOOL)isFullyLoaded;
-
-@end
-
diff --git a/ios/benchmark/MBXBenchViewController.mm b/ios/benchmark/MBXBenchViewController.mm
index 1876a0c54..6e1c6d325 100644
--- a/ios/benchmark/MBXBenchViewController.mm
+++ b/ios/benchmark/MBXBenchViewController.mm
@@ -1,12 +1,23 @@
 #import "MBXBenchViewController.h"
 
 #import <mbgl/ios/MGLMapView.h>
-#import <mbgl/ios/private/MGLMapView_Private.h>
 
 #include "locations.hpp"
 
 #include <chrono>
 
+@interface MGLMapView (MBXBenchmarkAdditions)
+
+#pragma mark - Debugging
+
+/** Triggers another render pass even when it is not necessary. */
+- (void)invalidate;
+
+/** Returns whether the map view is currently loading or processing any assets required to render the map */
+- (BOOL)isFullyLoaded;
+
+@end
+
 @interface MBXBenchViewController () <MGLMapViewDelegate>
 
 @property (nonatomic) MGLMapView *mapView;
diff --git a/ios/benchmark/fo/benchmark-ios.gypi b/ios/benchmark/fo/benchmark-ios.gypi
index ff004add5..0a3440d5c 100644
--- a/ios/benchmark/fo/benchmark-ios.gypi
+++ b/ios/benchmark/fo/benchmark-ios.gypi
@@ -26,7 +26,6 @@
 
       'sources': [
         './main.m',
-        '../../include/mbgl/ios/MGLMapView_private.h',
         './MBXBenchAppDelegate.h',
         './MBXBenchAppDelegate.m',
         './MBXBenchViewController.h',