X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfigparser.cpp;h=409ebdd395e67fe38de058edd0e823e73d28d3f2;hb=39ddf2fb7a4d030fc29a7d421e09394cd70dc9bf;hp=825dfc966c19b520c6216432ae72ede47b733da0;hpb=718a87e7e4ca4541a3c808ccb633eb362c2ef5b3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configparser.cpp b/src/configparser.cpp index 825dfc966..409ebdd39 100644 --- 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::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) {