From 816d79c32f3279a293cbb71d3d9c7e7e229069e4 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 18 Aug 2021 18:58:43 +0200 Subject: [PATCH] (Windows) Silenced some MSVC compiler warnings related to the C++17 language standard. --- es-app/src/scrapers/GamesDBJSONScraper.cpp | 4 ++++ es-app/src/scrapers/GamesDBJSONScraperResources.cpp | 4 ++++ es-core/src/utils/StringUtil.cpp | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index e92138254..69f9052ed 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -7,6 +7,10 @@ // Called from Scraper. // +#if defined(_MSC_VER) // MSVC compiler. +#define _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING +#endif + #include "scrapers/GamesDBJSONScraper.h" #include "scrapers/GamesDBJSONScraperResources.h" diff --git a/es-app/src/scrapers/GamesDBJSONScraperResources.cpp b/es-app/src/scrapers/GamesDBJSONScraperResources.cpp index aa806d6e2..64929712d 100644 --- a/es-app/src/scrapers/GamesDBJSONScraperResources.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraperResources.cpp @@ -12,6 +12,10 @@ // gamesdb_publishers.json // +#if defined(_MSC_VER) // MSVC compiler. +#define _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING +#endif + #include "scrapers/GamesDBJSONScraperResources.h" #include "Log.h" diff --git a/es-core/src/utils/StringUtil.cpp b/es-core/src/utils/StringUtil.cpp index 556622138..edb2f56d2 100644 --- a/es-core/src/utils/StringUtil.cpp +++ b/es-core/src/utils/StringUtil.cpp @@ -7,6 +7,10 @@ // Convert characters to Unicode, upper-/lowercase conversion, string formatting etc. // +#if defined(_MSC_VER) // MSVC compiler. +#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING +#endif + #include "utils/StringUtil.h" #include