diff --git a/examples/cocoa/CocoaAppDelegate.mm b/examples/cocoa/CocoaAppDelegate.mm index 4b4431e60..8f80b368b 100644 --- a/examples/cocoa/CocoaAppDelegate.mm +++ b/examples/cocoa/CocoaAppDelegate.mm @@ -32,13 +32,7 @@ #define GREEN @"Green" #define RED @"Red" -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif // Our PIMPL struct SFMLmainWindow diff --git a/src/SFML/Audio/ALCheck.cpp b/src/SFML/Audio/ALCheck.cpp index e4cf716ef..476b3e659 100644 --- a/src/SFML/Audio/ALCheck.cpp +++ b/src/SFML/Audio/ALCheck.cpp @@ -33,12 +33,8 @@ #include #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace { diff --git a/src/SFML/Audio/ALCheck.hpp b/src/SFML/Audio/ALCheck.hpp index 371216c1c..40b65aba0 100644 --- a/src/SFML/Audio/ALCheck.hpp +++ b/src/SFML/Audio/ALCheck.hpp @@ -33,14 +33,9 @@ #include #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif #include #include @@ -100,9 +95,5 @@ ALenum alGetLastErrorImpl(); #endif // SFML_ALCHECK_HPP #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif -#endif diff --git a/src/SFML/Audio/AudioDevice.cpp b/src/SFML/Audio/AudioDevice.cpp index e7d64981b..71da541f4 100644 --- a/src/SFML/Audio/AudioDevice.cpp +++ b/src/SFML/Audio/AudioDevice.cpp @@ -34,12 +34,8 @@ #include #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace { diff --git a/src/SFML/Audio/Music.cpp b/src/SFML/Audio/Music.cpp index f1c9c5cbc..a06053967 100644 --- a/src/SFML/Audio/Music.cpp +++ b/src/SFML/Audio/Music.cpp @@ -36,12 +36,8 @@ #include #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace sf { diff --git a/src/SFML/Audio/Sound.cpp b/src/SFML/Audio/Sound.cpp index 84451e273..8393fbfba 100644 --- a/src/SFML/Audio/Sound.cpp +++ b/src/SFML/Audio/Sound.cpp @@ -30,12 +30,8 @@ #include #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace sf { diff --git a/src/SFML/Audio/SoundBuffer.cpp b/src/SFML/Audio/SoundBuffer.cpp index b66e38e5d..d271c5a26 100644 --- a/src/SFML/Audio/SoundBuffer.cpp +++ b/src/SFML/Audio/SoundBuffer.cpp @@ -38,12 +38,8 @@ #include #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace sf { diff --git a/src/SFML/Audio/SoundRecorder.cpp b/src/SFML/Audio/SoundRecorder.cpp index df9c6bc49..3a64a39b3 100644 --- a/src/SFML/Audio/SoundRecorder.cpp +++ b/src/SFML/Audio/SoundRecorder.cpp @@ -40,12 +40,8 @@ #endif #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace { diff --git a/src/SFML/Audio/SoundSource.cpp b/src/SFML/Audio/SoundSource.cpp index 02d31c80c..1181c1769 100644 --- a/src/SFML/Audio/SoundSource.cpp +++ b/src/SFML/Audio/SoundSource.cpp @@ -29,12 +29,8 @@ #include #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace sf { diff --git a/src/SFML/Audio/SoundStream.cpp b/src/SFML/Audio/SoundStream.cpp index 6e08d78ef..85f76e883 100644 --- a/src/SFML/Audio/SoundStream.cpp +++ b/src/SFML/Audio/SoundStream.cpp @@ -40,12 +40,8 @@ #endif #if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif -#endif namespace sf { diff --git a/src/SFML/Window/Android/SensorImpl.cpp b/src/SFML/Window/Android/SensorImpl.cpp index 027d5e3db..7f97aca6e 100644 --- a/src/SFML/Window/Android/SensorImpl.cpp +++ b/src/SFML/Window/Android/SensorImpl.cpp @@ -30,9 +30,7 @@ #include -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) +#if defined(__clang__) || defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif diff --git a/src/SFML/Window/OSX/CursorImpl.mm b/src/SFML/Window/OSX/CursorImpl.mm index a59379504..3922b0a73 100644 --- a/src/SFML/Window/OSX/CursorImpl.mm +++ b/src/SFML/Window/OSX/CursorImpl.mm @@ -109,8 +109,8 @@ bool CursorImpl::loadFromSystem(Cursor::Type type) case Cursor::SizeBottom: newCursor = [NSCursor resizeUpDownCursor]; break; // These cursor types are undocumented, may not be available on some platforms -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wundeclared-selector" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wundeclared-selector" case Cursor::SizeTopRight: case Cursor::SizeBottomLeft: case Cursor::SizeBottomLeftTopRight: @@ -126,7 +126,7 @@ bool CursorImpl::loadFromSystem(Cursor::Type type) case Cursor::Help: newCursor = loadFromSelector(@selector(_helpCursor)); break; -#pragma clang diagnostic pop +#pragma GCC diagnostic pop } // clang-format on diff --git a/src/SFML/Window/OSX/SFApplication.m b/src/SFML/Window/OSX/SFApplication.m index 20a5466ab..db0465c63 100644 --- a/src/SFML/Window/OSX/SFApplication.m +++ b/src/SFML/Window/OSX/SFApplication.m @@ -28,13 +28,7 @@ //////////////////////////////////////////////////////////// #import -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/OSX/SFApplicationDelegate.m b/src/SFML/Window/OSX/SFApplicationDelegate.m index df10351b5..ed7363d46 100644 --- a/src/SFML/Window/OSX/SFApplicationDelegate.m +++ b/src/SFML/Window/OSX/SFApplicationDelegate.m @@ -28,13 +28,7 @@ //////////////////////////////////////////////////////////// #import -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// @implementation SFApplicationDelegate diff --git a/src/SFML/Window/OSX/SFContext.mm b/src/SFML/Window/OSX/SFContext.mm index 7eaf54850..5a1cdece9 100644 --- a/src/SFML/Window/OSX/SFContext.mm +++ b/src/SFML/Window/OSX/SFContext.mm @@ -35,13 +35,7 @@ #include #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif namespace sf { diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm index b82c86ef8..a705a4d9b 100644 --- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm +++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm @@ -29,13 +29,7 @@ #import #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm b/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm index 0a8d67939..32c78c6cd 100644 --- a/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm +++ b/src/SFML/Window/OSX/SFOpenGLView+keyboard.mm @@ -31,13 +31,7 @@ #import #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// /// In this file, we implement keyboard handling for SFOpenGLView diff --git a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm index e78a781ae..9fc390da7 100644 --- a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm +++ b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm @@ -32,13 +32,7 @@ #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/OSX/SFOpenGLView.h b/src/SFML/Window/OSX/SFOpenGLView.h index 2f4e44bbb..7ee094297 100644 --- a/src/SFML/Window/OSX/SFOpenGLView.h +++ b/src/SFML/Window/OSX/SFOpenGLView.h @@ -28,15 +28,8 @@ //////////////////////////////////////////////////////////// #import -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif namespace sf { @@ -212,10 +205,4 @@ class WindowImplCocoa; @end -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) #pragma GCC diagnostic pop -#endif -#endif diff --git a/src/SFML/Window/OSX/SFOpenGLView.mm b/src/SFML/Window/OSX/SFOpenGLView.mm index e4cdd26a5..60bc4c526 100644 --- a/src/SFML/Window/OSX/SFOpenGLView.mm +++ b/src/SFML/Window/OSX/SFOpenGLView.mm @@ -32,13 +32,7 @@ #import #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/OSX/SFViewController.mm b/src/SFML/Window/OSX/SFViewController.mm index 90b072fde..ce95b5c7a 100644 --- a/src/SFML/Window/OSX/SFViewController.mm +++ b/src/SFML/Window/OSX/SFViewController.mm @@ -34,13 +34,7 @@ #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif @implementation SFViewController diff --git a/src/SFML/Window/OSX/SFWindowController.mm b/src/SFML/Window/OSX/SFWindowController.mm index d63590e65..6cb481b80 100644 --- a/src/SFML/Window/OSX/SFWindowController.mm +++ b/src/SFML/Window/OSX/SFWindowController.mm @@ -43,13 +43,7 @@ #include #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// /// SFBlackView is a simple view filled with black, nothing more diff --git a/src/SFML/Window/OSX/WindowImplCocoa.hpp b/src/SFML/Window/OSX/WindowImplCocoa.hpp index 00379e4e0..3fac74a30 100644 --- a/src/SFML/Window/OSX/WindowImplCocoa.hpp +++ b/src/SFML/Window/OSX/WindowImplCocoa.hpp @@ -32,15 +32,8 @@ #include #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif //////////////////////////////////////////////////////////// /// Predefine OBJ-C classes @@ -379,12 +372,6 @@ private: } // namespace sf -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) #pragma GCC diagnostic pop -#endif -#endif #endif // SFML_WINDOWIMPLCOCOA_HPP diff --git a/src/SFML/Window/OSX/WindowImplDelegateProtocol.h b/src/SFML/Window/OSX/WindowImplDelegateProtocol.h index 3d06fad37..d67462a52 100644 --- a/src/SFML/Window/OSX/WindowImplDelegateProtocol.h +++ b/src/SFML/Window/OSX/WindowImplDelegateProtocol.h @@ -32,15 +32,8 @@ #import -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif namespace sf { @@ -246,10 +239,4 @@ class WindowImplCocoa; @end -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) #pragma GCC diagnostic pop -#endif -#endif diff --git a/src/SFML/Window/OSX/cg_sf_conversion.mm b/src/SFML/Window/OSX/cg_sf_conversion.mm index 65361fbb3..a5363927d 100644 --- a/src/SFML/Window/OSX/cg_sf_conversion.mm +++ b/src/SFML/Window/OSX/cg_sf_conversion.mm @@ -30,13 +30,7 @@ #import #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif namespace sf { diff --git a/src/SFML/Window/iOS/EaglContext.hpp b/src/SFML/Window/iOS/EaglContext.hpp index c832aeafc..9680e22b5 100644 --- a/src/SFML/Window/iOS/EaglContext.hpp +++ b/src/SFML/Window/iOS/EaglContext.hpp @@ -35,15 +35,8 @@ #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif SFML_DECLARE_OBJC_CLASS(EAGLContext); SFML_DECLARE_OBJC_CLASS(SFView); @@ -178,12 +171,6 @@ private: } // namespace sf -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) #pragma GCC diagnostic pop -#endif -#endif #endif // SFML_EAGLCONTEXT_HPP diff --git a/src/SFML/Window/iOS/EaglContext.mm b/src/SFML/Window/iOS/EaglContext.mm index 20aa9956a..d7bc67201 100644 --- a/src/SFML/Window/iOS/EaglContext.mm +++ b/src/SFML/Window/iOS/EaglContext.mm @@ -39,13 +39,7 @@ #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif namespace diff --git a/src/SFML/Window/iOS/SFAppDelegate.mm b/src/SFML/Window/iOS/SFAppDelegate.mm index 6b725f886..ea991cd92 100644 --- a/src/SFML/Window/iOS/SFAppDelegate.mm +++ b/src/SFML/Window/iOS/SFAppDelegate.mm @@ -176,25 +176,12 @@ std::vector touchPositions; if (!self.sfWindow) return false; -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wold-style-cast" -#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" -#endif -#endif UIViewController* rootViewController = [((__bridge UIWindow*)(self.sfWindow->getSystemHandle())) rootViewController]; -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) #pragma GCC diagnostic pop -#endif -#endif if (!rootViewController || ![rootViewController shouldAutorotate]) return false; diff --git a/src/SFML/Window/iOS/SFView.mm b/src/SFML/Window/iOS/SFView.mm index 8e951bed6..084f75909 100644 --- a/src/SFML/Window/iOS/SFView.mm +++ b/src/SFML/Window/iOS/SFView.mm @@ -32,13 +32,7 @@ #include #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif @interface SFView () diff --git a/src/SFML/Window/iOS/WindowImplUIKit.mm b/src/SFML/Window/iOS/WindowImplUIKit.mm index cc64e9369..f9f17baa8 100644 --- a/src/SFML/Window/iOS/WindowImplUIKit.mm +++ b/src/SFML/Window/iOS/WindowImplUIKit.mm @@ -34,13 +34,7 @@ #include -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif namespace sf { @@ -109,25 +103,12 @@ void WindowImplUIKit::processEvents() //////////////////////////////////////////////////////////// WindowHandle WindowImplUIKit::getSystemHandle() const { -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wold-style-cast" -#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" -#endif -#endif return (__bridge WindowHandle)m_window; -#if defined(__APPLE__) -#if defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) #pragma GCC diagnostic pop -#endif -#endif }