amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-17 19:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/sax2

Browse Source
This commit is contained in:
Niels Lohmann committed 2018-05-27 14:26:13 +02:00
2 parents 1f84cc2c88 1c6b332dcd
commit adf09726b0
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/json_fwd.hpp
+1 -1
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)) ([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
for serialization. for serialization.
*/ */
template<typename = void, typename = void> 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 =
single_include/nlohmann/json.hpp
+1 -1
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)) ([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
for serialization. for serialization.
*/ */
template<typename = void, typename = void> 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 =