Commit d8391a68 authored by GitHub Actions's avatar GitHub Actions
Browse files

Upstream release v3.2.0

parent 363880a4

README.md

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ include(FetchContent) 


FetchContent_Declare(json

  GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohman_json

  GIT_TAG v3.1.2)

  GIT_TAG v3.2.0)



FetchContent_GetProperties(json)

if(NOT json_POPULATED)

include/nlohmann/json.hpp

+2767 −1155

File changed.

Preview size limit exceeded, changes collapsed.

include/nlohmann/json_fwd.hpp

+2 −2
Original line number Diff line number Diff line
@@ -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 =