Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / configparser.cpp

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 825dfc966c19b520c6216432ae72ede47b733da0..409ebdd395e67fe38de058edd0e823e73d28d3f2 100644 (file)
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -388,8 +388,18 @@ bool ParseStack::ParseExec(const std::string& name, int flags, const std::string
        return ok;
 }
 
+#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;
        for(std::vector<KeyVal>::iterator j = items.begin(); j != items.end(); ++j)
@@ -409,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)
 {