From 99b37c64f90ed1de0e8f56d7dc0133c68a36dbe8 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Tue, 12 May 2015 17:07:54 -0400
Subject: [PATCH] compile OS X with --std=c++1y

because Travis uses Apple LLVM 6.0 and full c++14 support landed in 6.1
https://developer.apple.com/library/ios/documentation/DeveloperTools/Conceptual/WhatsNewXcode/WhatsNewXcode.pdf
---
 binding.gyp | 2 +-
 vendor/mbgl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 2fbd8f4d4..1f0f81c1f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -28,11 +28,11 @@
         ['OS=="mac"', {
           'xcode_settings': {
             'CLANG_CXX_LIBRARY': 'libc++',
-            'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
             'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
             'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
             'GCC_ENABLE_CPP_RTTI': 'YES',
             'OTHER_CPLUSPLUSFLAGS': [
+              '-std=c++1y',
               '-Werror',
               '-Wall',
               '-Wextra',
diff --git a/vendor/mbgl b/vendor/mbgl
index 4c89323f6..1d38b6364 160000
--- a/vendor/mbgl
+++ b/vendor/mbgl
@@ -1 +1 @@
-Subproject commit 4c89323f6d669d9d5f93469e677477b125242a5d
+Subproject commit 1d38b636402a6581c491185090f5c81495a07d13