oh wait, I did fix the forward declaration

This commit is contained in:
zetaPRIME 2017-03-03 16:38:58 -05:00
parent 7e600224e6
commit edf7945acd
2 changed files with 35 additions and 37 deletions

View File

@ -1,3 +1,36 @@
// okay, 2.1.x broke the forward declaration so here's a redirect until it gets proper fwd
#pragma once #pragma once
#include "json.hpp"
#ifndef NLOHMANN_JSON_FWD_HPP
#define NLOHMANN_JSON_FWD_HPP
#include <cstdint>
#include <map>
#include <vector>
#include <string>
#include <type_traits>
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, typename>
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

View File

@ -1,35 +0,0 @@
#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