Skip to content

J
json
Unverified Commit adf09726 by Niels Lohmann
Options

Merge branch 'develop' into feature/sax2

parents 1f84cc2c 1c6b332d
Showing with 2 additions and 2 deletions
include/nlohmann/json_fwd.hpp
......@@ -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 =
......
single_include/nlohmann/json.hpp
......@@ -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 =
......
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