From 93dcb523b116bde32600aaaea92d89850f8f1264 Mon Sep 17 00:00:00 2001 From: Idhrendur Date: Sun, 12 Jan 2025 14:16:44 -0800 Subject: [PATCH] Disable warning on linux --- CommonFunctions.cpp | 9 ++++ ConverterVersion.cpp | 3 ++ GameVersion.cpp | 12 +++++ Localization/LocalizationDatabase.cpp | 3 ++ ModLoader/ModFilesystem.h | 3 ++ ModLoader/ModLoader.cpp | 9 ++++ ModLoader/ModParser.cpp | 9 ++++ OSCommonLayer.cpp | 36 +++++++++++++ Parser.cpp | 3 ++ WinUtils.cpp | 3 ++ targa.cpp | 3 +- tests/CommonFunctionsTests.cpp | 54 +++++++++++++++++++ tests/ConverterVersionTests.cpp | 12 +++++ tests/GameVersionTests.cpp | 48 +++++++++++++++++ .../LocalizationDatabaseTests.cpp | 6 +++ tests/ModFilesystemTests.cpp | 5 +- tests/ModLoaderTests.cpp | 24 +++++++++ tests/ModParserTests.cpp | 18 +++++++ tests/ParserHelperTests.cpp | 3 ++ 19 files changed, 261 insertions(+), 2 deletions(-) diff --git a/CommonFunctions.cpp b/CommonFunctions.cpp index e6142e03..c05fceaf 100644 --- a/CommonFunctions.cpp +++ b/CommonFunctions.cpp @@ -17,9 +17,12 @@ std::string trimPath(const std::string& fileName) std::string getPath(const std::string& fileName) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto rawFile = trimPath(fileName); #pragma warning(pop) +#pragma GCC diagnostic pop const auto filePos = fileName.find(rawFile); return fileName.substr(0, filePos); } @@ -27,9 +30,12 @@ std::string getPath(const std::string& fileName) std::string trimExtension(const std::string& fileName) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto rawFile = trimPath(fileName); #pragma warning(pop) +#pragma GCC diagnostic pop const auto dotPos = rawFile.find_last_of('.'); if (dotPos == std::string::npos) { @@ -42,9 +48,12 @@ std::string trimExtension(const std::string& fileName) std::string getExtension(const std::string& fileName) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto rawFile = trimPath(fileName); #pragma warning(pop) +#pragma GCC diagnostic pop const auto dotPos = rawFile.find_last_of('.'); if (dotPos == std::string::npos) { diff --git a/ConverterVersion.cpp b/ConverterVersion.cpp index af45d66c..c1bd0464 100644 --- a/ConverterVersion.cpp +++ b/ConverterVersion.cpp @@ -23,9 +23,12 @@ void commonItems::ConverterVersion::loadVersion(const path& filename) void commonItems::ConverterVersion::loadVersion(const std::string& filename) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" loadVersion(u8path(filename)); #pragma warning(pop) +#pragma GCC diagnostic pop } diff --git a/GameVersion.cpp b/GameVersion.cpp index c655e4af..6b872ade 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -406,9 +406,12 @@ std::optional GameVersion::extractVersionFromLauncher(const path& f std::optional GameVersion::extractVersionFromLauncher(const std::string& filePath) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return extractVersionFromLauncher(u8path(filePath)); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -473,9 +476,12 @@ std::optional GameVersion::extractVersionByStringFromLauncher(const std::optional GameVersion::extractVersionByStringFromLauncher(const std::string& versionString, const std::string& filePath) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return extractVersionByStringFromLauncher(versionString, u8path(filePath)); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -533,9 +539,12 @@ std::optional GameVersion::extractVersionFromReadMe(const path& fil std::optional GameVersion::extractVersionFromReadMe(const std::string& filePath) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return extractVersionFromReadMe(u8path(filePath)); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -600,7 +609,10 @@ std::optional GameVersion::extractVersionFromChangeLog(const path& std::optional GameVersion::extractVersionFromChangeLog(const std::string& filePath) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return extractVersionFromChangeLog(u8path(filePath)); #pragma warning(pop) +#pragma GCC diagnostic pop } \ No newline at end of file diff --git a/Localization/LocalizationDatabase.cpp b/Localization/LocalizationDatabase.cpp index 68ee2817..f37d4aad 100644 --- a/Localization/LocalizationDatabase.cpp +++ b/Localization/LocalizationDatabase.cpp @@ -35,9 +35,12 @@ void commonItems::LocalizationDatabase::ScrapeLocalizations(const ModFilesystem& void commonItems::LocalizationDatabase::ScrapeLocalizations(const ModFilesystem& mod_filesystem, const std::string& localization_folder) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" commonItems::LocalizationDatabase::ScrapeLocalizations(mod_filesystem, u8path(localization_folder)); #pragma warning(pop) +#pragma GCC diagnostic pop } diff --git a/ModLoader/ModFilesystem.h b/ModLoader/ModFilesystem.h index e6c56c9f..8e7e0ed0 100644 --- a/ModLoader/ModFilesystem.h +++ b/ModLoader/ModFilesystem.h @@ -24,12 +24,15 @@ class ModFilesystem // replace_paths will block earlier mods and the game It is the caller's responsibility to sort the mods appropriately explicit ModFilesystem(std::filesystem::path game_root, std::vector mods): game_root_(game_root), mods_(std::move(mods)) {} #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" [[deprecated("Use the std::filesystem::path version")]] explicit ModFilesystem(std::string_view game_root, std::vector mods): game_root_(std::filesystem::u8path(game_root)), mods_(std::move(mods)) { } #pragma warning(pop) +#pragma GCC diagnostic pop // lookup functions [[nodiscard]] std::optional GetActualFileLocation(const std::filesystem::path& path) const; diff --git a/ModLoader/ModLoader.cpp b/ModLoader/ModLoader.cpp index 652dc935..9f008b5d 100644 --- a/ModLoader/ModLoader.cpp +++ b/ModLoader/ModLoader.cpp @@ -28,9 +28,12 @@ void commonItems::ModLoader::loadMods(const path& gameDocumentsPath, const Mods& void commonItems::ModLoader::loadMods(const std::string& gameDocumentsPath, const Mods& incomingMods) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" loadMods(std::vector{gameDocumentsPath + "/mod"}, incomingMods); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -96,7 +99,9 @@ void commonItems::ModLoader::loadMods(const std::vector& gameModPaths, con void commonItems::ModLoader::loadMods(const std::vector& gameModPaths, const Mods& incomingMods) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" if (gameModPaths.empty()) { Log(LogLevel::Info) << "No mod directories were provided. Skipping mod processing."; @@ -151,6 +156,7 @@ void commonItems::ModLoader::loadMods(const std::vector& gameModPat usableMods.emplace_back(Mod(mod.name, possibleModPath->string() + "/", mod.dependencies, mod.replacedFolders)); } #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -264,7 +270,9 @@ void commonItems::ModLoader::loadModDirectories(const std::vector& gameMod void commonItems::ModLoader::loadModDirectories(const std::vector& gameModPaths, const Mods& incomingMods) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::set diskModNames; for (const auto& modPath: gameModPaths) { @@ -365,6 +373,7 @@ void commonItems::ModLoader::loadModDirectories(const std::vector& } } #pragma warning(pop) +#pragma GCC diagnostic pop } diff --git a/ModLoader/ModParser.cpp b/ModLoader/ModParser.cpp index 8639ed45..bf55b91e 100644 --- a/ModLoader/ModParser.cpp +++ b/ModLoader/ModParser.cpp @@ -46,9 +46,12 @@ void commonItems::ModParser::parseMod(const path& fileName) void commonItems::ModParser::parseMod(const std::string& fileName) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" parseMod(u8path(fileName)); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -116,9 +119,12 @@ void commonItems::ModParser::parseMetadata(const path& metadata_path) void commonItems::ModParser::parseMetadata(const std::string& fileName) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" parseMetadata(u8path(fileName)); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -137,7 +143,10 @@ const std::set commonItems::ModParser::getReplacedPaths() const void commonItems::ModParser::setPath(const std::string& path) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" path_ = u8path(path).make_preferred(); #pragma warning(pop) +#pragma GCC diagnostic pop } \ No newline at end of file diff --git a/OSCommonLayer.cpp b/OSCommonLayer.cpp index 9c9f752a..5adf1824 100644 --- a/OSCommonLayer.cpp +++ b/OSCommonLayer.cpp @@ -21,7 +21,9 @@ namespace commonItems bool TryCreateFolder(const std::string& path) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" if (exists(u8path(path))) return true; if (create_directory(u8path(path))) @@ -30,6 +32,7 @@ bool TryCreateFolder(const std::string& path) Log(LogLevel::Error) << "Could not create directory: " << path << " : " << GetLastErrorString(); return false; #pragma warning(pop) +#pragma GCC diagnostic pop } std::wstring GetCurrentDirectoryWString() @@ -69,7 +72,9 @@ std::set GetAllFilesInFolder(const path& folder_path) std::set GetAllFilesInFolder(const std::string& path) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::set fileNames; if (!exists(u8path(path))) return fileNames; @@ -82,15 +87,19 @@ std::set GetAllFilesInFolder(const std::string& path) } return fileNames; #pragma warning(pop) +#pragma GCC diagnostic pop } void GetAllFilesInFolder(const std::string& path, std::set& fileNames) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" fileNames = GetAllFilesInFolder(path); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -113,7 +122,9 @@ std::set GetAllSubfolders(const path& folder_path) std::set GetAllSubfolders(const std::string& path) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::set subFolders; if (!exists(u8path(path))) return subFolders; @@ -126,15 +137,19 @@ std::set GetAllSubfolders(const std::string& path) } return subFolders; #pragma warning(pop) +#pragma GCC diagnostic pop } void GetAllSubfolders(const std::string& path, std::set& subFolders) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" subFolders = GetAllSubfolders(path); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -178,28 +193,36 @@ std::set GetAllFilesInFolderRecursive(const path& folder_path) void GetAllFilesInFolderRecursive(const std::string& path, std::set& fileNames) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" fileNames = GetAllFilesInFolderRecursive(path); #pragma warning(pop) +#pragma GCC diagnostic pop } bool TryCopyFile(const std::string& sourcePath, const std::string& destPath) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" if (copy_file(u8path(sourcePath), u8path(destPath), copy_options::overwrite_existing)) return true; LOG(LogLevel::Warning) << "Could not copy file " << sourcePath << " to " << destPath << " - " << GetLastErrorString(); return false; #pragma warning(pop) +#pragma GCC diagnostic pop } bool CopyFolder(const std::string& sourceFolder, const std::string& destFolder) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" try { copy(u8path(sourceFolder), u8path(destFolder), copy_options::recursive); @@ -211,13 +234,16 @@ bool CopyFolder(const std::string& sourceFolder, const std::string& destFolder) return false; } #pragma warning(pop) +#pragma GCC diagnostic pop } bool RenameFolder(const std::string& sourceFolder, const std::string& destFolder) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" try { rename(u8path(sourceFolder), u8path(destFolder)); @@ -229,6 +255,7 @@ bool RenameFolder(const std::string& sourceFolder, const std::string& destFolder return false; } #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -241,9 +268,12 @@ bool DoesFileExist(const path& path) bool DoesFileExist(const std::string& path) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return DoesFileExist(u8path(path)); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -256,16 +286,21 @@ bool DoesFolderExist(const path& path) bool DoesFolderExist(const std::string& path) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return DoesFolderExist(u8path(path)); #pragma warning(pop) +#pragma GCC diagnostic pop } bool DeleteFolder(const std::string& folder) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" if (!exists(u8path(folder))) return true; if (remove_all(u8path(folder)) != static_cast(-1)) @@ -273,6 +308,7 @@ bool DeleteFolder(const std::string& folder) Log(LogLevel::Error) << "Could not delete folder: " << folder << " " << GetLastErrorString(); return false; #pragma warning(pop) +#pragma GCC diagnostic pop } diff --git a/Parser.cpp b/Parser.cpp index d7c9945d..36ba7d0c 100644 --- a/Parser.cpp +++ b/Parser.cpp @@ -140,9 +140,12 @@ void commonItems::parser::parseFile(path filename) void commonItems::parser::parseFile(std::string_view filename) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" parseFile(u8path(filename)); #pragma warning(pop) +#pragma GCC diagnostic pop } diff --git a/WinUtils.cpp b/WinUtils.cpp index 1737ce88..dd42dd59 100644 --- a/WinUtils.cpp +++ b/WinUtils.cpp @@ -17,7 +17,9 @@ namespace commonItems std::set GetAllFilesInFolderRecursive(const std::string& path) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" auto validatedPath = path; if (validatedPath.ends_with('/') || validatedPath.ends_with('\\')) validatedPath = validatedPath.substr(0, validatedPath.size() - 1); // remove the trailing slash @@ -43,6 +45,7 @@ std::set GetAllFilesInFolderRecursive(const std::string& path) } return fileNames; #pragma warning(pop) +#pragma GCC diagnostic pop } diff --git a/targa.cpp b/targa.cpp index 4610a616..973fd7bb 100644 --- a/targa.cpp +++ b/targa.cpp @@ -14,6 +14,7 @@ /*@unused@*/ static const char rcsid[] = "$Id: targa.c,v 1.8 2004/10/09 09:30:26 emikulic Exp $"; #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #define TGA_KEEP_MACROS /* BIT, htole16, letoh16 */ #include "targa.h" @@ -404,7 +405,7 @@ tga_result tga_write(const char* filename, const tga_image* src) * called from tga_write_to_FILE(). It assumes that has its header * fields set up correctly. */ -#define PIXEL(ofs) (row + (ofs)*bpp) +#define PIXEL(ofs) (row + (ofs) * bpp) static tga_result tga_write_row_RLE(FILE* fp, const tga_image* src, const uint8_t* row) { #define WRITE(src, size) \ diff --git a/tests/CommonFunctionsTests.cpp b/tests/CommonFunctionsTests.cpp index 8864c330..813b1a42 100644 --- a/tests/CommonFunctionsTests.cpp +++ b/tests/CommonFunctionsTests.cpp @@ -45,9 +45,12 @@ TEST(TrimPath_Tests, TrimPathTrimsSlashes) { const std::string input = R"(/this/is/a/path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimPath(input), "path.txt"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(TrimPath_Tests, TrimPathTrimsBackslashes) @@ -55,9 +58,12 @@ TEST(TrimPath_Tests, TrimPathTrimsBackslashes) const std::string input = R"(c:\this\is\a\path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimPath(input), "path.txt"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(TrimPath_Tests, TrimPathTrimsMixedSlashes) @@ -65,9 +71,12 @@ TEST(TrimPath_Tests, TrimPathTrimsMixedSlashes) const std::string input = R"(c:\this\is/a/path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimPath(input), "path.txt"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(TrimPath_Tests, TrimPathTrimsReversedMixedSlashes) @@ -75,9 +84,12 @@ TEST(TrimPath_Tests, TrimPathTrimsReversedMixedSlashes) const std::string input = R"(/this/is\a\path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimPath(input), "path.txt"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(TrimPath_Tests, TrimPathDoesNotAffectRawFiles) @@ -85,9 +97,12 @@ TEST(TrimPath_Tests, TrimPathDoesNotAffectRawFiles) const std::string input = R"(path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimPath(input), "path.txt"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetPath_Tests, GetPathGetsSlashedPath) @@ -95,9 +110,12 @@ TEST(GetPath_Tests, GetPathGetsSlashedPath) const std::string input = R"(/this/is/a/path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ("/this/is/a/", getPath(input)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetPath_Tests, GetPathGetsBackslashedPath) @@ -105,9 +123,12 @@ TEST(GetPath_Tests, GetPathGetsBackslashedPath) const std::string input = R"(c:\this\is\a\path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(R"(c:\this\is\a\)", getPath(input)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetPath_Tests, GetPathGetsMixedSlashedPath) @@ -115,9 +136,12 @@ TEST(GetPath_Tests, GetPathGetsMixedSlashedPath) const std::string input = R"(c:\this\is/a/path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(R"(c:\this\is/a/)", getPath(input)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetPath_Tests, GetPathGetsReversedMixedSlashedPath) @@ -125,9 +149,12 @@ TEST(GetPath_Tests, GetPathGetsReversedMixedSlashedPath) const std::string input = R"(/this/is\a\path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(R"(/this/is\a\)", getPath(input)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetPath_Tests, GetPathReturnsBlankStringForRawFiles) @@ -135,9 +162,12 @@ TEST(GetPath_Tests, GetPathReturnsBlankStringForRawFiles) const std::string input = R"(path.txt)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_TRUE(getPath(input).empty()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(TrimExtension_Tests, TrimExtensionTrimsDot) @@ -145,9 +175,12 @@ TEST(TrimExtension_Tests, TrimExtensionTrimsDot) const std::string input = R"(file.extension)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimExtension(input), "file"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(TrimExtension_Tests, TrimExtensionTrimsLastDot) @@ -155,9 +188,12 @@ TEST(TrimExtension_Tests, TrimExtensionTrimsLastDot) const std::string input = R"(file.name.with.extension)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimExtension(input), "file.name.with"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(TrimExtension_Tests, TrimExtensionDoesNotAffectDirectories) @@ -165,9 +201,12 @@ TEST(TrimExtension_Tests, TrimExtensionDoesNotAffectDirectories) const std::string input = R"(/path/with.extension/filename)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ(trimExtension(input), "/path/with.extension/filename"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetExtension_Tests, GetExtensionGetsPostDot) @@ -175,9 +214,12 @@ TEST(GetExtension_Tests, GetExtensionGetsPostDot) const std::string input = R"(file.extension)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ("extension", getExtension(input)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetExtension_Tests, GetExtensionGetsPostLastDot) @@ -185,9 +227,12 @@ TEST(GetExtension_Tests, GetExtensionGetsPostLastDot) const std::string input = R"(file.name.with.extension)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ("extension", getExtension(input)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetExtension_Tests, GetExtensionReturnsEmptyStringForNoExtension) @@ -195,9 +240,12 @@ TEST(GetExtension_Tests, GetExtensionReturnsEmptyStringForNoExtension) const std::string input = R"(filename)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_TRUE(getExtension(input).empty()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetExtension_Tests, GetExtensionDoesNotAffectDirectories) @@ -205,9 +253,12 @@ TEST(GetExtension_Tests, GetExtensionDoesNotAffectDirectories) const std::string input = R"(/path/with.extension/directoryname)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_TRUE(getExtension(input).empty()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(GetExtension_Tests, GetExtensionWorksOnAbsolutePaths) @@ -215,9 +266,12 @@ TEST(GetExtension_Tests, GetExtensionWorksOnAbsolutePaths) const std::string input = R"(c:\path/with.extension/filename.mod)"; #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ASSERT_EQ("mod", getExtension(input)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ReplaceCharacter_Tests, ReplaceCharacterCanReplaceSpaces) diff --git a/tests/ConverterVersionTests.cpp b/tests/ConverterVersionTests.cpp index 21f56dec..43319233 100644 --- a/tests/ConverterVersionTests.cpp +++ b/tests/ConverterVersionTests.cpp @@ -4,7 +4,9 @@ TEST(ConverterVersion_Tests, ItemsDefaultToEmpty) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" commonItems::ConverterVersion converterVersion; // Using std::string_view version because it calls the other converterVersion.loadVersion(std::string("emptyVersion.txt")); @@ -18,13 +20,16 @@ TEST(ConverterVersion_Tests, ItemsDefaultToEmpty) EXPECT_EQ(GameVersion(), converterVersion.getMinTarget()); EXPECT_EQ(GameVersion(), converterVersion.getMaxTarget()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ConverterVersion_Tests, ItemsCanBeImported) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" commonItems::ConverterVersion converterVersion; // Using std::string_view version because it calls the other converterVersion.loadVersion(std::string("version.txt")); @@ -38,19 +43,23 @@ TEST(ConverterVersion_Tests, ItemsCanBeImported) EXPECT_EQ(GameVersion("1.0"), converterVersion.getMinTarget()); EXPECT_EQ(GameVersion("1.1"), converterVersion.getMaxTarget()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ConverterVersion_Tests, DescriptionCanBeConstructed) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" commonItems::ConverterVersion converterVersion; // Using std::string_view version because it calls the other converterVersion.loadVersion(std::string("version.txt")); EXPECT_EQ("Compatible with EU4 [v1.31-v1.31.7] and Vic3 [v1.0-v1.1]", converterVersion.getDescription()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ConverterVersion_Tests, DescriptionDoesNotDuplicateIdenticalVersions) @@ -71,7 +80,9 @@ TEST(ConverterVersion_Tests, DescriptionDoesNotDuplicateIdenticalVersions) TEST(ConverterVersion_Tests, ConverterVersionCanBeOutput) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" commonItems::ConverterVersion converterVersion; // Using std::string_view version because it calls the other converterVersion.loadVersion(std::string("version.txt")); @@ -111,6 +122,7 @@ TEST(ConverterVersion_Tests, ConverterVersionCanBeOutput) std::getline(actualStream, actualLine); EXPECT_EQ(expectedLine, actualLine); // footer line #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ConverterVersion_Tests, ConverterVersionOutputSkipsIncompleteVersionOrName) diff --git a/tests/GameVersionTests.cpp b/tests/GameVersionTests.cpp index 14df2bcf..36b4f6e2 100644 --- a/tests/GameVersionTests.cpp +++ b/tests/GameVersionTests.cpp @@ -428,9 +428,12 @@ TEST(GameVersion_Tests, LargerishForActualIntendedZeroWithoutSubversions) TEST(GameVersion_Tests, extractVersionFromLauncherExtractsGameVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("launcher-settings.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(GameVersion("1.31.5"), *version); } @@ -439,9 +442,12 @@ TEST(GameVersion_Tests, extractVVersionFromLauncherExtractsGameVersion) { // They started adding v in front of a version, eg. v1.37.0.0 #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("launcher-settings-1.37.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(GameVersion("1.37.0"), *version); } @@ -449,9 +455,12 @@ TEST(GameVersion_Tests, extractVVersionFromLauncherExtractsGameVersion) TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForMissingFile) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("launcher-settings.json2")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -459,9 +468,12 @@ TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForMissingFile) TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForMissingRawVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("ChangeLog.txt")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -469,9 +481,12 @@ TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForMissingRawVer TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForBrokenRawVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("broken-settings.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -479,9 +494,12 @@ TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForBrokenRawVers TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForNonsenseRawVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("broken-settings2.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -489,9 +507,12 @@ TEST(GameVersion_Tests, extractVersionFromLauncherReturnsNulloptForNonsenseRawVe TEST(GameVersion_Tests, extractVersionFromLauncherReturnsVersionForChangedRawVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("changed-settings.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(GameVersion("1.31.5"), *version); } @@ -499,9 +520,12 @@ TEST(GameVersion_Tests, extractVersionFromLauncherReturnsVersionForChangedRawVer TEST(GameVersion_Tests, extractVersionFromLauncherReturnsVersionForRome) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromLauncher(std::string("rome-settings.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(GameVersion("2.0.3"), *version); } @@ -509,9 +533,12 @@ TEST(GameVersion_Tests, extractVersionFromLauncherReturnsVersionForRome) TEST(GameVersion_Tests, extractVersionFromReadMeExtractsGameVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromReadMe(std::string("Readme.txt")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(GameVersion("3.3"), *version); } @@ -519,9 +546,12 @@ TEST(GameVersion_Tests, extractVersionFromReadMeExtractsGameVersion) TEST(GameVersion_Tests, extractVersionFromReadMeReturnsNulloptForMissingFile) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromReadMe(std::string("Readme.txt2")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -529,9 +559,12 @@ TEST(GameVersion_Tests, extractVersionFromReadMeReturnsNulloptForMissingFile) TEST(GameVersion_Tests, extractVersionFromReadMeReturnsNulloptForBrokenFile) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromReadMe(std::string("changed-settings.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -539,9 +572,12 @@ TEST(GameVersion_Tests, extractVersionFromReadMeReturnsNulloptForBrokenFile) TEST(GameVersion_Tests, extractVersionFromReadMeReturnsNulloptForNonsenseVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromReadMe(std::string("BrokenMe.txt")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -549,9 +585,12 @@ TEST(GameVersion_Tests, extractVersionFromReadMeReturnsNulloptForNonsenseVersion TEST(GameVersion_Tests, extractVersionFromChangeLogExtractsGameVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromChangeLog(std::string("ChangeLog.txt")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(GameVersion("3.3.3"), *version); } @@ -559,9 +598,12 @@ TEST(GameVersion_Tests, extractVersionFromChangeLogExtractsGameVersion) TEST(GameVersion_Tests, extractVersionFromChangeLogReturnsNulloptForMissingFile) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromChangeLog(std::string("ChangeLog.txt2")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -569,9 +611,12 @@ TEST(GameVersion_Tests, extractVersionFromChangeLogReturnsNulloptForMissingFile) TEST(GameVersion_Tests, extractVersionFromChangeLogReturnsNulloptForBrokenFile) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromChangeLog(std::string("changed-settings.json")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } @@ -579,9 +624,12 @@ TEST(GameVersion_Tests, extractVersionFromChangeLogReturnsNulloptForBrokenFile) TEST(GameVersion_Tests, extractVersionFromChangeLogReturnsNulloptForNonsenseVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const auto version = GameVersion::extractVersionFromChangeLog(std::string("BrokenLog.txt")); #pragma warning(pop) +#pragma GCC diagnostic pop EXPECT_EQ(std::nullopt, version); } diff --git a/tests/Localization/LocalizationDatabaseTests.cpp b/tests/Localization/LocalizationDatabaseTests.cpp index 23765f70..6b85fdc7 100644 --- a/tests/Localization/LocalizationDatabaseTests.cpp +++ b/tests/Localization/LocalizationDatabaseTests.cpp @@ -158,7 +158,9 @@ TEST(Localization_LocalizationDatabase_Tests, LocalizationsFromUnsupportedLangua TEST(Localization_LocalizationDatabase_Tests, LocalizationsCanBeReadFromFilesystem) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" commonItems::ModLoader modLoader; // calling std::string version because it calls the other modLoader.loadMods(std::string("GameDocumentsFolder"), {Mod{"The Mod", "mod/themod.mod"}}); @@ -203,12 +205,15 @@ TEST(Localization_LocalizationDatabase_Tests, LocalizationsCanBeReadFromFilesyst const auto non_loc_block = database.GetLocalizationBlock("NON_LOC_KEY"); EXPECT_FALSE(non_loc_block.has_value()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(Localization_LocalizationDatabase_Tests, LocalizationsCanBeReadFromMetaModFilesystem) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" commonItems::ModLoader modLoader; // calling std::string version because it calls the other modLoader.loadMods(std::string("GameDocumentsFolder"), {Mod{"The Metadata Mod", ""}}); @@ -253,4 +258,5 @@ TEST(Localization_LocalizationDatabase_Tests, LocalizationsCanBeReadFromMetaModF const auto non_loc_block = database.GetLocalizationBlock("NON_LOC_KEY"); EXPECT_FALSE(non_loc_block.has_value()); #pragma warning(pop) +#pragma GCC diagnostic pop } \ No newline at end of file diff --git a/tests/ModFilesystemTests.cpp b/tests/ModFilesystemTests.cpp index d2c584fd..07ce9c7b 100644 --- a/tests/ModFilesystemTests.cpp +++ b/tests/ModFilesystemTests.cpp @@ -6,7 +6,9 @@ #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" TEST(ModFilesystemTests, MissingFileReturnsNullopt) { const commonItems::ModFilesystem mod_filesystem(std::string_view("ModFilesystem/GetActualFileLocation/game_root"), {}); @@ -349,4 +351,5 @@ TEST(ModFilesystemTests, FilesAreFoundEvenWithTrailingSlashInPath) "ModFilesystem/GetActualFileLocation/mod_one/test_folder/mod_one_file.txt", "ModFilesystem/GetActualFileLocation/mod_two/test_folder/mod_two_file.txt")); } -#pragma warning(pop) \ No newline at end of file +#pragma warning(pop) +#pragma GCC diagnostic pop \ No newline at end of file diff --git a/tests/ModLoaderTests.cpp b/tests/ModLoaderTests.cpp index 1c7cc0c8..939207bf 100644 --- a/tests/ModLoaderTests.cpp +++ b/tests/ModLoaderTests.cpp @@ -12,7 +12,9 @@ using testing::UnorderedElementsAre; TEST(ModLoaderTests, LoadModsLogsWhenNoMods) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" const Mods incomingMods; std::stringstream log; @@ -30,6 +32,7 @@ TEST(ModLoaderTests, LoadModsLogsWhenNoMods) EXPECT_TRUE(mods.empty()); EXPECT_THAT(actualStream.str(), testing::HasSubstr(R"([INFO] No mods were detected in savegame. Skipping mod processing.)")); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -37,7 +40,9 @@ TEST(ModLoaderTests, LoadModsLogsWhenNoMods) TEST(ModLoaderTests, ModsByPathCanBeLocatedUnpackedAndUpdated) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Mods incomingMods; // this is what comes from the save incomingMods.emplace_back(Mod("Some mod", "mod/themod.mod")); // mod's in fact named "The Mod" in the file. @@ -51,13 +56,16 @@ TEST(ModLoaderTests, ModsByPathCanBeLocatedUnpackedAndUpdated) EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\themodsfolder/"); EXPECT_THAT(mods[0].dependencies, UnorderedElementsAre("Packed Mod", "Missing Mod")); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModLoaderTests, ModsByNameCanBeLocatedUnpackedAndUpdated) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Mods incomingMods; // this is what comes from the save incomingMods.emplace_back(Mod("The Mod", "")); // No path given, old-style mod inputs. @@ -71,13 +79,16 @@ TEST(ModLoaderTests, ModsByNameCanBeLocatedUnpackedAndUpdated) EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\themodsfolder/"); EXPECT_THAT(mods[0].dependencies, UnorderedElementsAre("Packed Mod", "Missing Mod")); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModLoaderTests, ModsByNameCanBeLocatedByMetadataUnpackedAndUpdated) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Mods incomingMods; // this is what comes from the save incomingMods.emplace_back(Mod("The Metadata Mod", "")); // No path given, old-style mod inputs. @@ -91,13 +102,16 @@ TEST(ModLoaderTests, ModsByNameCanBeLocatedByMetadataUnpackedAndUpdated) EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\the_metadata_mod/"); EXPECT_THAT(mods[0].replacedFolders, testing::UnorderedElementsAre("replaced/path", "replaced/path/two")); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModLoaderTests, BrokenMissingAndNonexistentModsAreDiscarded) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Mods incomingMods; incomingMods.emplace_back(Mod("", "mod/themod.mod")); // no name given but valid! incomingMods.emplace_back(Mod("Broken mod", "mod/brokenmod.mod")); // no path @@ -113,13 +127,16 @@ TEST(ModLoaderTests, BrokenMissingAndNonexistentModsAreDiscarded) EXPECT_EQ(mods[0].name, "The Mod"); EXPECT_EQ(mods[0].path.string(), "GameDocumentsFolder/mod\\themodsfolder/"); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModLoaderTests, CompressedModsCanBeUnpacked) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Mods incomingMods; incomingMods.emplace_back(Mod("some packed mod", "mod/packedmod.mod")); @@ -133,13 +150,16 @@ TEST(ModLoaderTests, CompressedModsCanBeUnpacked) EXPECT_EQ(mods[0].path.string(), "mods\\packedmod/"); EXPECT_TRUE(commonItems::DoesFolderExist(mods[0].path)); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModLoaderTests, BrokenCompressedModsAreSkipped) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Mods incomingMods; incomingMods.emplace_back(Mod("broken packed mod", "mod/brokenpacked.mod")); @@ -150,6 +170,7 @@ TEST(ModLoaderTests, BrokenCompressedModsAreSkipped) EXPECT_TRUE(mods.empty()); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -181,7 +202,9 @@ TEST(ModLoaderTests, MultipleModDirectoriesCanBeLoaded) TEST(ModLoaderTests, MultipleModDirectoriesCanBeLoadedStringVersion) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Mods incomingMods; // this is what comes from the save incomingMods.emplace_back(Mod("The Mod", "")); // No path given, old-style mod inputs. incomingMods.emplace_back(Mod("The Metadata Mod Two", "")); // No path given, old-style mod inputs. @@ -203,4 +226,5 @@ TEST(ModLoaderTests, MultipleModDirectoriesCanBeLoadedStringVersion) EXPECT_EQ(mods[2].path, "GameDocumentsFolder/mod/the_metadata_mod/"); EXPECT_THAT(mods[2].replacedFolders, testing::UnorderedElementsAre("replaced/path", "replaced/path/two")); #pragma warning(pop) +#pragma GCC diagnostic pop } \ No newline at end of file diff --git a/tests/ModParserTests.cpp b/tests/ModParserTests.cpp index a7428ccb..1bf1a4e7 100644 --- a/tests/ModParserTests.cpp +++ b/tests/ModParserTests.cpp @@ -12,7 +12,9 @@ using testing::UnorderedElementsAre; TEST(ModParserTests, modPrimitivesDefaultToBlank) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::stringstream input; commonItems::ModParser theMod; theMod.parseMod(input); @@ -33,13 +35,16 @@ TEST(ModParserTests, modPrimitivesDefaultToBlank) EXPECT_TRUE(the_mod_file.getReplacedPaths().empty()); EXPECT_TRUE(the_mod_file.getFilesystemReplacedPaths().empty()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModParserTests, modPrimitivesCanBeSet) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::stringstream input; input << "name=modName\n"; input << "path=modPath\n"; @@ -67,13 +72,16 @@ TEST(ModParserTests, modPrimitivesCanBeSet) EXPECT_THAT(the_mod_file.getReplacedPaths(), UnorderedElementsAre("replaced\\path", "replaced\\path\\two")); EXPECT_THAT(the_mod_file.getFilesystemReplacedPaths(), UnorderedElementsAre(path("replaced/path"), path("replaced/path/two"))); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModParserTests, metadataPrimitivesDefaultToBlank) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::stringstream input; input << "{}"; commonItems::ModParser theMod; @@ -99,13 +107,16 @@ TEST(ModParserTests, metadataPrimitivesDefaultToBlank) EXPECT_TRUE(the_mod_file.getReplacedPaths().empty()); EXPECT_TRUE(the_mod_file.getFilesystemReplacedPaths().empty()); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModParserTests, metadataPrimitivesCanBeSet) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::stringstream input; input << "{\n"; input << " \"name\" : \"modName\",\n"; @@ -137,13 +148,16 @@ TEST(ModParserTests, metadataPrimitivesCanBeSet) EXPECT_THAT(the_mod_file.getReplacedPaths(), UnorderedElementsAre("replaced\\path", "replaced\\path\\two")); EXPECT_THAT(the_mod_file.getFilesystemReplacedPaths(), UnorderedElementsAre(path("replaced/path"), path("replaced/path/two"))); #pragma warning(pop) +#pragma GCC diagnostic pop } TEST(ModParserTests, modPathCanBeSetFromArchive) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::stringstream input; input << "archive=modPath\n"; commonItems::ModParser theMod; @@ -152,6 +166,7 @@ TEST(ModParserTests, modPathCanBeSetFromArchive) EXPECT_EQ("modPath", theMod.getPath()); EXPECT_EQ(path("modPath"), theMod.getFilesystemPath()); #pragma warning(pop) +#pragma GCC diagnostic pop } @@ -213,7 +228,9 @@ TEST(ModParserTests, modIsCompressedForZipAndBinPaths) TEST(ModParserTests, PathCanBeUpdated) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::stringstream input; input << "name=modName\n"; input << "path=modPath\n"; @@ -224,4 +241,5 @@ TEST(ModParserTests, PathCanBeUpdated) EXPECT_EQ(theMod.getPath(), "updated_path"); #pragma warning(pop) +#pragma GCC diagnostic pop } \ No newline at end of file diff --git a/tests/ParserHelperTests.cpp b/tests/ParserHelperTests.cpp index b374e200..b5e5d746 100644 --- a/tests/ParserHelperTests.cpp +++ b/tests/ParserHelperTests.cpp @@ -779,7 +779,9 @@ TEST(ParserHelper_Tests, SingleStringGetsQuotedCurly) TEST(ParserHelper_Tests, StringOfObjectConvertsBracedObjectsToStrings) { #pragma warning(push) +#pragma GCC diagnostic push #pragma warning(disable : 4996) +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::stringstream input; input >> std::noskipws; input << "=\n"; @@ -794,6 +796,7 @@ TEST(ParserHelper_Tests, StringOfObjectConvertsBracedObjectsToStrings) ASSERT_EQ(input.str(), theObject.getString()); #pragma warning(pop) +#pragma GCC diagnostic pop }