From c931e2d92878c9bb335af91bce5d79fca5834065 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 21 May 2022 12:13:01 +0200 Subject: [PATCH] Fix missing `#pragma GCC diagnostic push` --- io/misc.cpp | 1 + tests/iotests.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/io/misc.cpp b/io/misc.cpp index 25114d5..b2d27a5 100644 --- a/io/misc.cpp +++ b/io/misc.cpp @@ -39,6 +39,7 @@ std::string readFile(std::string_view path, std::string_view::size_type maxSize) file.seekg(ios_base::beg); // ignore warning about null pointer dereference from GCC 12 for now (which is *likely* not correct) #ifdef __GNUC__ +#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnull-dereference" #endif res.assign((istreambuf_iterator(file)), istreambuf_iterator()); diff --git a/tests/iotests.cpp b/tests/iotests.cpp index 3da0587..3713f42 100644 --- a/tests/iotests.cpp +++ b/tests/iotests.cpp @@ -448,6 +448,7 @@ void IoTests::testAdvancedIniFile() inputFile.seekg(std::ios_base::beg); // ignore warning about null pointer dereference from GCC 12 for now (which is *likely* not correct) #ifdef __GNUC__ +#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wnull-dereference" #endif originalContents.assign((istreambuf_iterator(inputFile)), istreambuf_iterator());