summaryrefslogtreecommitdiff
path: root/src/configparser.cpp
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-10-27 15:26:20 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-10-27 15:26:20 +0100
commit3a3ff949670c61a4a8856e1391222e156eb1cd17 (patch)
treefd8023fefa4829ceea428ec424608ef9aace1d9a /src/configparser.cpp
parentcba05046ce20eed4c429093296eb481bf95d7e07 (diff)
parentc99a43968f6a04c7d5d3038b4e39d14c22aa6e89 (diff)
Merge insp20
Diffstat (limited to 'src/configparser.cpp')
-rw-r--r--src/configparser.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/configparser.cpp b/src/configparser.cpp
index 60770d16d..1c406f218 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -385,8 +385,17 @@ bool ParseStack::ParseFile(const std::string& path, int flags, const std::string
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"
+#endif
+ // 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)