From: Attila Molnar <attilamolnar@hush.com>
Date: Mon, 29 Feb 2016 11:40:21 +0000 (+0100)
Subject: Merge pull request #1147 from SaberUK/insp20+gcc6
X-Git-Tag: v2.0.23~23
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=ccd4c11ea1a43d079eaae9708482ef4a9148796c;hp=515874b0b7cf9a89d3338673ebd37043c10147fe;p=user%2Fhenk%2Fcode%2Finspircd.git

Merge pull request #1147 from SaberUK/insp20+gcc6

[2.0] Fix GCC 6 warning about null checking this.
---

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 94192a71b..409ebdd39 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -388,19 +388,20 @@ bool ParseStack::ParseExec(const std::string& name, int flags, const std::string
 	return ok;
 }
 
-bool ConfigTag::readString(const std::string& key, std::string& value, bool allow_lf)
-{
 #ifdef __clang__
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wunknown-pragmas"
 # pragma clang diagnostic ignored "-Wundefined-bool-conversion"
+#elif defined __GNUC__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpragmas"
+# pragma GCC diagnostic ignored "-Wnonnull-compare"
 #endif
+bool ConfigTag::readString(const std::string& key, std::string& value, bool allow_lf)
+{
 	// TODO: this is undefined behaviour but changing the API is too risky for 2.0.
 	if (!this)
 		return false;
-#ifdef __clang__
-# pragma clang diagnostic pop
-#endif
 	for(std::vector<KeyVal>::iterator j = items.begin(); j != items.end(); ++j)
 	{
 		if(j->first != key)
@@ -418,6 +419,11 @@ bool ConfigTag::readString(const std::string& key, std::string& value, bool allo
 	}
 	return false;
 }
+#ifdef __clang__
+# pragma clang diagnostic pop
+#elif defined __GNUC__
+# pragma GCC diagnostic pop
+#endif
 
 std::string ConfigTag::getString(const std::string& key, const std::string& def)
 {