From baddc6389e8094ba62650fbf9a3a443bc19bb652 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 2 May 2017 17:12:20 +0100 Subject: [PATCH] Workarounds for some new "recommended" Xcode warning flags --- modules/juce_audio_utils/juce_audio_utils.h | 8 ++++---- modules/juce_events/juce_events.cpp | 21 ++++++++++++++++----- modules/juce_gui_basics/juce_gui_basics.cpp | 9 +++++++++ modules/juce_gui_extra/juce_gui_extra.cpp | 10 ++++++++++ modules/juce_opengl/juce_opengl.cpp | 9 +++++++++ 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/modules/juce_audio_utils/juce_audio_utils.h b/modules/juce_audio_utils/juce_audio_utils.h index afd508c34c..d04cbda269 100644 --- a/modules/juce_audio_utils/juce_audio_utils.h +++ b/modules/juce_audio_utils/juce_audio_utils.h @@ -60,15 +60,15 @@ //============================================================================== /** Config: JUCE_USE_CDREADER - Enables the AudioCDReader class (on supported platforms). - */ + Enables the AudioCDReader class (on supported platforms). +*/ #ifndef JUCE_USE_CDREADER #define JUCE_USE_CDREADER 0 #endif /** Config: JUCE_USE_CDBURNER - Enables the AudioCDBurner class (on supported platforms). - */ + Enables the AudioCDBurner class (on supported platforms). +*/ #ifndef JUCE_USE_CDBURNER #define JUCE_USE_CDBURNER 0 #endif diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp index 41dcbf1083..50d8fdd69a 100644 --- a/modules/juce_events/juce_events.cpp +++ b/modules/juce_events/juce_events.cpp @@ -71,13 +71,24 @@ namespace juce #include "interprocess/juce_ConnectedChildProcess.cpp" //============================================================================== -#if JUCE_MAC - #include "native/juce_osx_MessageQueue.h" - #include "native/juce_mac_MessageManager.mm" +#if JUCE_MAC || JUCE_IOS -#elif JUCE_IOS #include "native/juce_osx_MessageQueue.h" - #include "native/juce_ios_MessageManager.mm" + + #if JUCE_CLANG + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wundeclared-selector" + #endif + + #if JUCE_MAC + #include "native/juce_mac_MessageManager.mm" + #else + #include "native/juce_ios_MessageManager.mm" + #endif + + #if JUCE_CLANG + #pragma clang diagnostic pop + #endif #elif JUCE_WINDOWS #include "native/juce_win32_Messaging.cpp" diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp index bd23816f66..3c1e54df04 100644 --- a/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/modules/juce_gui_basics/juce_gui_basics.cpp @@ -268,6 +268,11 @@ extern bool juce_areThereAnyAlwaysOnTopWindows(); #if JUCE_MAC || JUCE_IOS + #if JUCE_CLANG + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wundeclared-selector" + #endif + #if JUCE_IOS #include "native/juce_ios_UIViewComponentPeer.mm" #include "native/juce_ios_Windowing.mm" @@ -277,6 +282,10 @@ extern bool juce_areThereAnyAlwaysOnTopWindows(); #include "native/juce_mac_MainMenu.mm" #endif + #if JUCE_CLANG + #pragma clang diagnostic pop + #endif + #include "native/juce_mac_MouseCursor.mm" #include "native/juce_mac_FileChooser.mm" diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp index 27b6468ede..f89e0a86ec 100644 --- a/modules/juce_gui_extra/juce_gui_extra.cpp +++ b/modules/juce_gui_extra/juce_gui_extra.cpp @@ -111,6 +111,12 @@ namespace juce //============================================================================== #if JUCE_MAC || JUCE_IOS + + #if JUCE_CLANG + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wundeclared-selector" + #endif + #if JUCE_MAC #include "native/juce_mac_NSViewComponent.mm" #include "native/juce_mac_AppleRemote.mm" @@ -125,6 +131,10 @@ namespace juce #include "native/juce_mac_WebBrowserComponent.mm" #endif + #if JUCE_CLANG + #pragma clang diagnostic pop + #endif + //============================================================================== #elif JUCE_WINDOWS #include "native/juce_win32_ActiveXComponent.cpp" diff --git a/modules/juce_opengl/juce_opengl.cpp b/modules/juce_opengl/juce_opengl.cpp index b0a37e3c6a..3938dd566b 100644 --- a/modules/juce_opengl/juce_opengl.cpp +++ b/modules/juce_opengl/juce_opengl.cpp @@ -200,12 +200,21 @@ private: //============================================================================== #if JUCE_MAC || JUCE_IOS + #if JUCE_CLANG + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wundeclared-selector" + #endif + #if JUCE_MAC #include "native/juce_OpenGL_osx.h" #else #include "native/juce_OpenGL_ios.h" #endif + #if JUCE_CLANG + #pragma clang diagnostic pop + #endif + #elif JUCE_WINDOWS #include "native/juce_OpenGL_win32.h"