haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update nlohmann::json to 3.9.0 

Release notes:
https://github.com/nlohmann/json/releases/tag/v3.9.0
This commit is contained in:
Jon Evans 2020-07-28 21:44:01 -04:00
parent dae40d5c9f
commit 0d70cb70ea
2 changed files with 6077 additions and 3591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9636
thirdparty/nlohmann_json/nlohmann/json.hpp vendored
View File

File diff suppressed because it is too large Load Diff

32
thirdparty/nlohmann_json/nlohmann/json_fwd.hpp vendored
View File

@ -25,15 +25,16 @@ template<typename T = void, typename SFINAE = void>
struct adl_serializer; struct adl_serializer;
template<template<typename U, typename V, typename... Args> class ObjectType = template<template<typename U, typename V, typename... Args> class ObjectType =
std::map, std::map,
template<typename U, typename... Args> class ArrayType = std::vector, template<typename U, typename... Args> class ArrayType = std::vector,
class StringType = std::string, class BooleanType = bool, class StringType = std::string, class BooleanType = bool,
class NumberIntegerType = std::int64_t, class NumberIntegerType = std::int64_t,
class NumberUnsignedType = std::uint64_t, class NumberUnsignedType = std::uint64_t,
class NumberFloatType = double, class NumberFloatType = double,
template<typename U> class AllocatorType = std::allocator, template<typename U> class AllocatorType = std::allocator,
template<typename T, typename SFINAE = void> class JSONSerializer = template<typename T, typename SFINAE = void> class JSONSerializer =
adl_serializer> adl_serializer,
class BinaryType = std::vector<std::uint8_t>>
class basic_json; class basic_json;
/*! /*!
@ -59,6 +60,19 @@ uses the standard template types.
@since version 1.0.0 @since version 1.0.0
*/ */
using json = basic_json<>; using json = basic_json<>;
template<class Key, class T, class IgnoredLess, class Allocator>
struct ordered_map;
/*!
@brief ordered JSON class
This type preserves the insertion order of object keys.
@since version 3.9.0
*/
using ordered_json = basic_json<nlohmann::ordered_map>;
} // namespace nlohmann } // namespace nlohmann
#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_ #endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_