haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-04 21:36:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/sax2

Browse source
This commit is contained in:
Niels Lohmann 2018-05-27 14:26:13 +02:00
parent 1f84cc2c88 1c6b332dcd
commit adf09726b0
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/nlohmann/json_fwd.hpp
View file

@ -21,7 +21,7 @@ This serializer ignores the template arguments and uses ADL
([argument-dependent lookup](http://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 =

2
single_include/nlohmann/json.hpp
View file

@ -70,7 +70,7 @@ This serializer ignores the template arguments and uses ADL
([argument-dependent lookup](http://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 =