Merge branch 'develop' into feature/sax2

2018-05-27 14:26:13 +02:00 · 2018-05-27 14:26:13 +02:00 · adf09726b0
commit adf09726b0
parent 1f84cc2c88 1c6b332dcd
2 changed files with 2 additions and 2 deletions
--- a/include/nlohmann/json_fwd.hpp
+++ b/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 =