Unverified Commit adf09726 authored by Niels Lohmann's avatar Niels Lohmann

Merge branch 'develop' into feature/sax2

parents 1f84cc2c 1c6b332d
...@@ -21,7 +21,7 @@ This serializer ignores the template arguments and uses ADL ...@@ -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 =
......
...@@ -70,7 +70,7 @@ This serializer ignores the template arguments and uses ADL ...@@ -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 =
......
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