summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2017-04-21 13:17:09 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2017-04-21 13:17:09 +0200
commitf75c9d28e2768d6006485dd1d628378816b0a2e1 (patch)
tree2151ac383d753824b5033ff70132055bf1663667
parent3d145c656d0c8dc8892d09d7a090f5d1368f7a17 (diff)
Disable no-invalid-source-encoding warning in debug mode.
-rw-r--r--configure.ac2
-rw-r--r--plugingui/utf8.cc4
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index d437b0f..722f0b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ dnl Set up debug compile args if the user requested it
dnl ===========================
AS_IF([test "x$with_debug" == "xyes"],
[AC_MSG_WARN([*** Building with debug support!])
- CXXFLAGS="$CXXFLAGS -Wall -Werror -g $NO_UNDEFINED_PARAM"
+ CXXFLAGS="$CXXFLAGS -Wall -Werror -Wno-invalid-source-encoding -g $NO_UNDEFINED_PARAM"
HUGIN_PARM=""]
)
diff --git a/plugingui/utf8.cc b/plugingui/utf8.cc
index 770d115..a14fd43 100644
--- a/plugingui/utf8.cc
+++ b/plugingui/utf8.cc
@@ -26,9 +26,6 @@
*/
#include "utf8.h"
-// Disable clang encoding warnings for creation of this map.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winvalid-source-encoding"
UTF8::UTF8()
{
// Encode Map
@@ -293,7 +290,6 @@ UTF8::UTF8()
// FIXME: This is just a hack to make Goran Mekic's name work.
map_decode["Ä\x87"] = "c";
}
-#pragma clang diagnostic pop
std::string UTF8::fromLatin1(std::string const& s)
{