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 -#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 - > -class basic_json; - -using json = basic_json; - -} // 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 +#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