diff --git a/libstarlight/source/starlight/_incLib/json_fwd.hpp b/libstarlight/source/starlight/_incLib/json_fwd.hpp index ae421cc..acc46c3 100644 --- a/libstarlight/source/starlight/_incLib/json_fwd.hpp +++ b/libstarlight/source/starlight/_incLib/json_fwd.hpp @@ -1,3 +1,36 @@ -// okay, 2.1.x broke the forward declaration so here's a redirect until it gets proper fwd #pragma once -#include "json.hpp" + +#ifndef NLOHMANN_JSON_FWD_HPP +#define NLOHMANN_JSON_FWD_HPP + +#include +#include +#include +#include +#include + +namespace nlohmann +{ + +template < + template class ObjectType, + template class ArrayType, + class StringType, + class BooleanType, + class NumberIntegerType, + class NumberUnsignedType, + class NumberFloatType, + template class AllocatorType, + template class JSONSerializer + > +class basic_json; + +template +struct adl_serializer; + +using json = basic_json; + +} // namespace nlohmann + +#endif // NLOHMANN_JSON_FWD_HPP diff --git a/libstarlight/source/starlight/_incLib/json_fwd.hpp.broken b/libstarlight/source/starlight/_incLib/json_fwd.hpp.broken deleted file mode 100644 index 50ba4f4..0000000 --- a/libstarlight/source/starlight/_incLib/json_fwd.hpp.broken +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#ifndef NLOHMANN_JSON_FWD_HPP -#define NLOHMANN_JSON_FWD_HPP - -#include -#include -#include -#include - -namespace nlohmann -{ - -template < - template class ObjectType, - template class ArrayType, - class StringType, - class BooleanType, - class NumberIntegerType, - class NumberUnsignedType, - class NumberFloatType, - template class AllocatorType, - template class JSONSerializer - > -class basic_json; - -template -struct adl_serializer; - -using json = basic_json; - -} // namespace nlohmann - -#endif // NLOHMANN_JSON_FWD_HPP