Use upstream nlohmann_json

This commit is contained in:
Eelco Dolstra 2019-10-22 20:12:23 +02:00
parent ac9b427541
commit 9cac895406
4 changed files with 6 additions and 20911 deletions

View file

@ -2,9 +2,9 @@
"inputs": { "inputs": {
"nixpkgs": { "nixpkgs": {
"inputs": {}, "inputs": {},
"narHash": "sha256-ltGlDPfwicH/u4orj1n4JXgRsA+jvKQsGnekObi0TV4=", "narHash": "sha256-D1YSQzR6Xo2cNZ4sf+WCak2fqE/CIbwpZbPKd2B2Syc=",
"originalUri": "nixpkgs/release-19.03", "originalUrl": "nixpkgs/release-19.09",
"uri": "github:edolstra/nixpkgs/9a593b575e4044f9aff939b512e7cb1cf1e76a65" "url": "github:edolstra/nixpkgs/e3d44c4fc62c99b850c792429cb61b946b66a704"
} }
}, },
"version": 3 "version": 3

View file

@ -3,7 +3,7 @@
edition = 201909; edition = 201909;
inputs.nixpkgs.uri = "nixpkgs/release-19.03"; inputs.nixpkgs.uri = "nixpkgs/release-19.09";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
@ -73,6 +73,7 @@
bzip2 xz brotli editline bzip2 xz brotli editline
openssl pkgconfig sqlite boehmgc openssl pkgconfig sqlite boehmgc
boost boost
nlohmann_json
# Tests # Tests
git git
@ -313,7 +314,7 @@
doInstallCheck = true; doInstallCheck = true;
lcovFilter = [ "*/boost/*" "*-tab.*" "*/nlohmann/*" "*/linenoise/*" ]; lcovFilter = [ "*/boost/*" "*-tab.*" "*/linenoise/*" ];
# We call `dot', and even though we just use it to # We call `dot', and even though we just use it to
# syntax-check generated dot files, it still requires some # syntax-check generated dot files, it still requires some

File diff suppressed because it is too large Load diff

View file

@ -1,64 +0,0 @@
#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
#include <cstdint> // int64_t, uint64_t
#include <map> // map
#include <memory> // allocator
#include <string> // string
#include <vector> // vector
/*!
@brief namespace for Niels Lohmann
@see https://github.com/nlohmann
@since version 1.0.0
*/
namespace nlohmann
{
/*!
@brief default JSONSerializer template argument
This serializer ignores the template arguments and uses ADL
([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
for serialization.
*/
template<typename T = void, typename SFINAE = void>
struct adl_serializer;
template<template<typename U, typename V, typename... Args> class ObjectType =
std::map,
template<typename U, typename... Args> class ArrayType = std::vector,
class StringType = std::string, class BooleanType = bool,
class NumberIntegerType = std::int64_t,
class NumberUnsignedType = std::uint64_t,
class NumberFloatType = double,
template<typename U> class AllocatorType = std::allocator,
template<typename T, typename SFINAE = void> class JSONSerializer =
adl_serializer>
class basic_json;
/*!
@brief JSON Pointer
A JSON pointer defines a string syntax for identifying a specific value
within a JSON document. It can be used with functions `at` and
`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
@since version 2.0.0
*/
template<typename BasicJsonType>
class json_pointer;
/*!
@brief default JSON class
This type is the default specialization of the @ref basic_json class which
uses the standard template types.
@since version 1.0.0
*/
using json = basic_json<>;
} // namespace nlohmann
#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_