Commit 653fdec3 authored by Mikaël Salson's avatar Mikaël Salson

Merge branch 'feature-a/upgrade-lib-json' into 'dev'

lib/json{,_fwd}.hpp: upgrade to 3.9.1

See merge request !953
parents 496b6569 93a0626f
Pipeline #242604 passed with stages
in 20 minutes and 14 seconds
......@@ -11,8 +11,8 @@
* @link http://www.cs.unc.edu/Research/compgeom/gzstream/
* @license LGPL
json : Json library
* @version 2.1.1
json : JSON for Modern C++
* @version 3.9.1
* @author Niels Lohmann
* @link https://github.com/nlohmann/json
* @license MIT
......
This diff is collapsed.
#ifndef NLOHMANN_JSON_FWD_HPP
#define NLOHMANN_JSON_FWD_HPP
#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
#include <cstdint> // int64_t, uint64_t
#include <map> // map
......@@ -18,10 +18,10 @@ namespace nlohmann
@brief default JSONSerializer template argument
This serializer ignores the template arguments and uses ADL
([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
for serialization.
*/
template<typename = void, typename = void>
template<typename T = void, typename SFINAE = void>
struct adl_serializer;
template<template<typename U, typename V, typename... Args> class ObjectType =
......@@ -33,7 +33,8 @@ template<template<typename U, typename V, typename... Args> class ObjectType =
class NumberFloatType = double,
template<typename U> class AllocatorType = std::allocator,
template<typename T, typename SFINAE = void> class JSONSerializer =
adl_serializer>
adl_serializer,
class BinaryType = std::vector<std::uint8_t>>
class basic_json;
/*!
......@@ -59,6 +60,19 @@ uses the standard template types.
@since version 1.0.0
*/
using json = basic_json<>;
}
#endif
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
#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_
......@@ -3,8 +3,11 @@
# Test examples embedded in 'doc/vidjil-algo.md'
# Run eight times
8:vidjil-algo -- V.D.J recombinations analysis .*vidjil.org
# Run nine times
9:vidjil-algo -- V.D.J recombinations analysis .*vidjil.org
# '-h', two times
2:Examples
# '-c clone' (or implied), five times
5: end of clones
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment