From 7e600224e60ec249793ac5084d6b747e1b6f80e6 Mon Sep 17 00:00:00 2001
From: zetaPRIME <qmanxt@gmail.com>
Date: Fri, 3 Mar 2017 06:59:07 -0500
Subject: [PATCH] welp, that broke the forward declaration and I can't actually
 fix it

---
 .../source/starlight/_incLib/json_fwd.hpp     | 32 ++---------------
 .../starlight/_incLib/json_fwd.hpp.broken     | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 30 deletions(-)
 create mode 100644 libstarlight/source/starlight/_incLib/json_fwd.hpp.broken

diff --git a/libstarlight/source/starlight/_incLib/json_fwd.hpp b/libstarlight/source/starlight/_incLib/json_fwd.hpp
index 30663ce..ae421cc 100644
--- a/libstarlight/source/starlight/_incLib/json_fwd.hpp
+++ b/libstarlight/source/starlight/_incLib/json_fwd.hpp
@@ -1,31 +1,3 @@
+// okay, 2.1.x broke the forward declaration so here's a redirect until it gets proper fwd
 #pragma once
-
-#ifndef NLOHMANN_JSON_FWD_HPP
-#define NLOHMANN_JSON_FWD_HPP
-
-#include <cstdint>
-#include <map>
-#include <vector>
-#include <string>
-
-namespace nlohmann
-{
-
-template <
-    template<typename U, typename V, typename... Args> class ObjectType,
-    template<typename U, typename... Args> class ArrayType,
-    class StringType,
-    class BooleanType,
-    class NumberIntegerType,
-    class NumberUnsignedType,
-    class NumberFloatType,
-    template<typename U> class AllocatorType
-    >
-class basic_json;
-
-using json = basic_json<std::map,std::vector,std::string,bool,std::int64_t,
-                        std::uint64_t,double,std::allocator>;
-
-} // namespace nlohmann
-
-#endif // NLOHMANN_JSON_FWD_HPP
+#include "json.hpp"
diff --git a/libstarlight/source/starlight/_incLib/json_fwd.hpp.broken b/libstarlight/source/starlight/_incLib/json_fwd.hpp.broken
new file mode 100644
index 0000000..50ba4f4
--- /dev/null
+++ b/libstarlight/source/starlight/_incLib/json_fwd.hpp.broken
@@ -0,0 +1,35 @@
+#pragma once
+
+#ifndef NLOHMANN_JSON_FWD_HPP
+#define NLOHMANN_JSON_FWD_HPP
+
+#include <cstdint>
+#include <map>
+#include <vector>
+#include <string>
+
+namespace nlohmann
+{
+
+template <
+    template<typename U, typename V, typename... Args> class ObjectType,
+    template<typename U, typename... Args> class ArrayType,
+    class StringType,
+    class BooleanType,
+    class NumberIntegerType,
+    class NumberUnsignedType,
+    class NumberFloatType,
+    template<typename U> class AllocatorType,
+    template<typename T, typename SFINAE = void> class JSONSerializer
+    >
+class basic_json;
+
+template<typename = void, typename = void>
+struct adl_serializer;
+
+using json = basic_json<std::map,std::vector,std::string,bool,std::int64_t,
+                        std::uint64_t,double,std::allocator,adl_serializer>;
+
+} // namespace nlohmann
+
+#endif // NLOHMANN_JSON_FWD_HPP