From 29906758a18167127a1a038003c8754282d2d0ca Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 30 Jul 2022 13:38:41 +0100
Subject: Wrap up ignore deprecated copy warning in ustring.h

---
 libjsonpp/json.ll          |  2 +-
 libjsonpp/jsonpp.h         |  5 ++---
 libjsonpp/serialize.cpp    |  1 +
 libjsonpp/testParse.cpp    |  1 +
 libjsonpp/ustring_wrap.cpp |  1 +
 libjsonpp/ustring_wrap.h   | 10 ++++++++++
 6 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 libjsonpp/ustring_wrap.cpp
 create mode 100644 libjsonpp/ustring_wrap.h

diff --git a/libjsonpp/json.ll b/libjsonpp/json.ll
index 71f509f..7a1d38d 100644
--- a/libjsonpp/json.ll
+++ b/libjsonpp/json.ll
@@ -8,7 +8,7 @@
 %option prefix="jsonBase"
 
 %{
-#include <glibmm/ustring.h>
+#include "ustring_wrap.h"
 #include "jsonFlexLexer.h"
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
diff --git a/libjsonpp/jsonpp.h b/libjsonpp/jsonpp.h
index 4966827..1f70c88 100644
--- a/libjsonpp/jsonpp.h
+++ b/libjsonpp/jsonpp.h
@@ -2,7 +2,7 @@
 #define JSONPP_H
 
 #include "jsonFlexLexer.h"
-#include <glibmm/ustring.h>
+#include "ustring_wrap.h"
 #include <map>
 #include <variant>
 #include <vector>
@@ -15,8 +15,7 @@ namespace json {
 	using Number = double;
 	using Boolean = bool;
 #pragma GCC visibility push(default)
-	class Null {
-	};
+	class Null { };
 	class Object;
 	class Array;
 	using Value = std::variant<Null, String, Number, Object, Array, Boolean>;
diff --git a/libjsonpp/serialize.cpp b/libjsonpp/serialize.cpp
index 31f066e..8a2a25d 100644
--- a/libjsonpp/serialize.cpp
+++ b/libjsonpp/serialize.cpp
@@ -1,4 +1,5 @@
 #include "jsonpp.h"
+#include "ustring_wrap.h"
 #include <glibmm/convert.h>
 #include <iomanip>
 #include <ios>
diff --git a/libjsonpp/testParse.cpp b/libjsonpp/testParse.cpp
index a93c88e..b288167 100644
--- a/libjsonpp/testParse.cpp
+++ b/libjsonpp/testParse.cpp
@@ -2,6 +2,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include "jsonpp.h"
+#include "ustring_wrap.h"
 #include <filesystem>
 #include <fstream>
 
diff --git a/libjsonpp/ustring_wrap.cpp b/libjsonpp/ustring_wrap.cpp
new file mode 100644
index 0000000..039165f
--- /dev/null
+++ b/libjsonpp/ustring_wrap.cpp
@@ -0,0 +1 @@
+#include "ustring_wrap.h"
diff --git a/libjsonpp/ustring_wrap.h b/libjsonpp/ustring_wrap.h
new file mode 100644
index 0000000..25e9b96
--- /dev/null
+++ b/libjsonpp/ustring_wrap.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#ifdef __clang__
+#	pragma clang diagnostic push
+#	pragma clang diagnostic ignored "-Wdeprecated-copy"
+#endif
+#include <glibmm/ustring.h>
+#ifdef __clang__
+#	pragma clang diagnostic pop
+#endif
-- 
cgit v1.2.3