From 142b59246e13b6801f49d79bd029f57fdd2f7d45 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Tue, 22 Sep 2015 17:31:00 -0400
Subject: [PATCH] [osx] disable -Wunused-local-typedefs

Fixes OS X builds with Xcode 7, necessitated by
https://svn.boost.org/trac/boost/ticket/11240
---
 bin/render.cpp | 6 +++++-
 macosx/main.mm | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/render.cpp b/bin/render.cpp
index 3da0c9358..2248d8603 100644
--- a/bin/render.cpp
+++ b/bin/render.cpp
@@ -9,13 +9,17 @@
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/sqlite_cache.hpp>
 
+#pragma clang diagnostic push
 #pragma GCC diagnostic push
-#ifndef __clang__
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wunused-local-typedefs"
+#else
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 #include <boost/program_options.hpp>
 #pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 namespace po = boost::program_options;
 
diff --git a/macosx/main.mm b/macosx/main.mm
index 24251e6d4..7698773e7 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -12,13 +12,17 @@
 
 #import <Foundation/Foundation.h>
 
+#pragma clang diagnostic push
 #pragma GCC diagnostic push
-#ifndef __clang__
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wunused-local-typedefs"
+#else
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 #include <boost/program_options.hpp>
 #pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 #include <iostream>