From f75c9d28e2768d6006485dd1d628378816b0a2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Nusser?= <andre.nusser@googlemail.com>
Date: Fri, 21 Apr 2017 13:17:09 +0200
Subject: Disable no-invalid-source-encoding warning in debug mode.

---
 configure.ac      | 2 +-
 plugingui/utf8.cc | 4 ----
 2 files changed, 1 insertion(+), 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)
 {
-- 
cgit v1.2.3