From 88aaf4107f55170e9332ac3e95e18d64ad678496 Mon Sep 17 00:00:00 2001
From: Peter <craven@gmx.net>
Date: Tue, 25 Apr 2017 13:38:08 +0200
Subject: [PATCH] Fix all remaining gcc warnings

Fixes #3935
---
 contrib/json/JsonUtils.cpp | 7 +++++++
 src/StringF.cpp            | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/contrib/json/JsonUtils.cpp b/contrib/json/JsonUtils.cpp
index 804c62b75..86f909372 100644
--- a/contrib/json/JsonUtils.cpp
+++ b/contrib/json/JsonUtils.cpp
@@ -10,7 +10,14 @@
 #include "../../src/Serializer.h" // Need this for the exceptions
 
 extern "C" {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wattributes"
+#endif
 #include "miniz/miniz.h"
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace {
diff --git a/src/StringF.cpp b/src/StringF.cpp
index 836a53c9a..2896ee9c7 100644
--- a/src/StringF.cpp
+++ b/src/StringF.cpp
@@ -360,10 +360,10 @@ std::string to_string(const std::string& value, const FormatSpec& fmt) {
 // ---------------------------------------------------------------------------
 // ## string_format() and helpers
 
-static inline const char* scan_unformatted(const char* fmt) {
-	const char *c = fmt;
-	return c;
-}
+// static inline const char* scan_unformatted(const char* fmt) {
+// 	const char *c = fmt;
+// 	return c;
+// }
 
 static inline const char* scan_int(const char* fmt, int& value) {
 	value = 0;