From 552aad877c7cbf6f4f32488868dcb5f7c4e1a025 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 19 Nov 2022 23:43:27 +0000 Subject: [PATCH] Ignore internal deprecated warnings under msvc Signed-off-by: falkTX --- dgl/Widget.hpp | 29 +++++++++++++++++------------ distrho/src/DistrhoPlugin.cpp | 9 +++++++-- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dgl/Widget.hpp b/dgl/Widget.hpp index ab20d7766..e05c17d69 100644 --- a/dgl/Widget.hpp +++ b/dgl/Widget.hpp @@ -448,19 +448,24 @@ class Widget A function called when a special key is pressed or released. DEPRECATED use onKeyboard or onCharacterInput */ -#if defined(__clang__) -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 460 -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif + #if defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable:4996) + #elif defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdeprecated-declarations" + #elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 460 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #endif virtual bool onSpecial(const SpecialEvent&) { return false; } -#if defined(__clang__) -# pragma clang diagnostic pop -#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 460 -# pragma GCC diagnostic pop -#endif + #if defined(_MSC_VER) + #pragma warning(pop) + #elif defined(__clang__) + #pragma clang diagnostic pop + #elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 460 + #pragma GCC diagnostic pop + #endif private: struct PrivateData; diff --git a/distrho/src/DistrhoPlugin.cpp b/distrho/src/DistrhoPlugin.cpp index 1128e9f8e..0fa4f5ba0 100644 --- a/distrho/src/DistrhoPlugin.cpp +++ b/distrho/src/DistrhoPlugin.cpp @@ -195,7 +195,10 @@ void Plugin::initState(const uint32_t index, State& state) uint hints = 0x0; String stateKey, defaultStateValue; - #if defined(__clang__) + #if defined(_MSC_VER) + #pragma warning(push) + #pragma warning(disable:4996) + #elif defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" #elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) @@ -205,7 +208,9 @@ void Plugin::initState(const uint32_t index, State& state) initState(index, stateKey, defaultStateValue); if (isStateFile(index)) hints = kStateIsFilenamePath; - #if defined(__clang__) + #if defined(_MSC_VER) + #pragma warning(pop) + #elif defined(__clang__) #pragma clang diagnostic pop #elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) #pragma GCC diagnostic pop