Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
adf09726
Unverified
Commit
adf09726
authored
7 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature/sax2
parents
1f84cc2c
1c6b332d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
include/nlohmann/json_fwd.hpp
include/nlohmann/json_fwd.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+1
-1
No files found.
include/nlohmann/json_fwd.hpp
View file @
adf09726
...
@@ -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
=
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
adf09726
...
@@ -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 =
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment