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
25f56ff2
Unverified
Commit
25f56ff2
authored
Mar 20, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
📝
updated documentation
parent
99ecca55
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
32 deletions
+42
-32
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+21
-16
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+21
-16
No files found.
include/nlohmann/json.hpp
View file @
25f56ff2
...
@@ -6629,14 +6629,15 @@ class basic_json
...
@@ -6629,14 +6629,15 @@ class basic_json
@sa http://cbor.io
@sa http://cbor.io
@sa @ref to_cbor(const basic_json&) for the analogous serialization
@sa @ref to_cbor(const basic_json&) for the analogous serialization
@sa @ref from_msgpack(detail::input_adapter, const bool) for the
@sa @ref from_msgpack(detail::input_adapter, const bool
, const bool
) for the
related MessagePack format
related MessagePack format
@sa @ref from_ubjson(detail::input_adapter, const bool
) for the related
@sa @ref from_ubjson(detail::input_adapter, const bool
, const bool) for the
UBJSON format
related
UBJSON format
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
consume input adapters, removed start_index parameter, and added
consume input adapters, removed start_index parameter, and added
@a strict parameter since 3.0.0
@a strict parameter since 3.0.0; added @allow_exceptions parameter
since 3.2.0
*/
*/
static
basic_json
from_cbor
(
detail
::
input_adapter
i
,
static
basic_json
from_cbor
(
detail
::
input_adapter
i
,
const
bool
strict
=
true
,
const
bool
strict
=
true
,
...
@@ -6649,7 +6650,7 @@ class basic_json
...
@@ -6649,7 +6650,7 @@ class basic_json
}
}
/*!
/*!
@copydoc from_cbor(detail::input_adapter, const bool)
@copydoc from_cbor(detail::input_adapter, const bool
, const bool
)
*/
*/
template
<
typename
A1
,
typename
A2
,
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
...
@@ -6731,14 +6732,15 @@ class basic_json
...
@@ -6731,14 +6732,15 @@ class basic_json
@sa http://msgpack.org
@sa http://msgpack.org
@sa @ref to_msgpack(const basic_json&) for the analogous serialization
@sa @ref to_msgpack(const basic_json&) for the analogous serialization
@sa @ref from_cbor(detail::input_adapter, const bool
) for the related CBOR
@sa @ref from_cbor(detail::input_adapter, const bool
, const bool) for the
format
related CBOR
format
@sa @ref from_ubjson(detail::input_adapter, const bool
) for the related
@sa @ref from_ubjson(detail::input_adapter, const bool
, const bool) for
UBJSON format
the related
UBJSON format
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
consume input adapters, removed start_index parameter, and added
consume input adapters, removed start_index parameter, and added
@a strict parameter since 3.0.0
@a strict parameter since 3.0.0; added @allow_exceptions parameter
since 3.2.0
*/
*/
static
basic_json
from_msgpack
(
detail
::
input_adapter
i
,
static
basic_json
from_msgpack
(
detail
::
input_adapter
i
,
const
bool
strict
=
true
,
const
bool
strict
=
true
,
...
@@ -6751,7 +6753,7 @@ class basic_json
...
@@ -6751,7 +6753,7 @@ class basic_json
}
}
/*!
/*!
@copydoc from_msgpack(detail::input_adapter, const bool)
@copydoc from_msgpack(detail::input_adapter, const bool
, const bool
)
*/
*/
template
<
typename
A1
,
typename
A2
,
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
...
@@ -6815,12 +6817,12 @@ class basic_json
...
@@ -6815,12 +6817,12 @@ class basic_json
@sa http://ubjson.org
@sa http://ubjson.org
@sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
@sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
analogous serialization
analogous serialization
@sa @ref from_cbor(detail::input_adapter, const bool
) for the related CBOR
@sa @ref from_cbor(detail::input_adapter, const bool
, const bool) for the
format
related CBOR
format
@sa @ref from_msgpack(detail::input_adapter, const bool
) for the related
@sa @ref from_msgpack(detail::input_adapter, const bool
, const bool) for
MessagePack format
the related
MessagePack format
@since version 3.1.0
@since version 3.1.0
; added @allow_exceptions parameter since 3.2.0
*/
*/
static
basic_json
from_ubjson
(
detail
::
input_adapter
i
,
static
basic_json
from_ubjson
(
detail
::
input_adapter
i
,
const
bool
strict
=
true
,
const
bool
strict
=
true
,
...
@@ -6832,6 +6834,9 @@ class basic_json
...
@@ -6832,6 +6834,9 @@ class basic_json
return
res
?
result
:
basic_json
(
value_t
::
discarded
);
return
res
?
result
:
basic_json
(
value_t
::
discarded
);
}
}
/*!
@copydoc from_ubjson(detail::input_adapter, const bool, const bool)
*/
template
<
typename
A1
,
typename
A2
,
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
static
basic_json
from_ubjson
(
A1
&&
a1
,
A2
&&
a2
,
static
basic_json
from_ubjson
(
A1
&&
a1
,
A2
&&
a2
,
...
...
single_include/nlohmann/json.hpp
View file @
25f56ff2
...
@@ -17378,14 +17378,15 @@ class basic_json
...
@@ -17378,14 +17378,15 @@ class basic_json
@sa http://cbor.io
@sa http://cbor.io
@sa @ref to_cbor(const basic_json&) for the analogous serialization
@sa @ref to_cbor(const basic_json&) for the analogous serialization
@sa @ref from_msgpack(detail::input_adapter, const bool) for the
@sa @ref from_msgpack(detail::input_adapter, const bool
, const bool
) for the
related MessagePack format
related MessagePack format
@sa @ref from_ubjson(detail::input_adapter, const bool
) for the related
@sa @ref from_ubjson(detail::input_adapter, const bool
, const bool) for the
UBJSON format
related
UBJSON format
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
consume input adapters, removed start_index parameter, and added
consume input adapters, removed start_index parameter, and added
@a strict parameter since 3.0.0
@a strict parameter since 3.0.0; added @allow_exceptions parameter
since 3.2.0
*/
*/
static
basic_json
from_cbor
(
detail
::
input_adapter
i
,
static
basic_json
from_cbor
(
detail
::
input_adapter
i
,
const
bool
strict
=
true
,
const
bool
strict
=
true
,
...
@@ -17398,7 +17399,7 @@ class basic_json
...
@@ -17398,7 +17399,7 @@ class basic_json
}
}
/*!
/*!
@copydoc from_cbor(detail::input_adapter, const bool)
@copydoc from_cbor(detail::input_adapter, const bool
, const bool
)
*/
*/
template
<
typename
A1
,
typename
A2
,
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
...
@@ -17480,14 +17481,15 @@ class basic_json
...
@@ -17480,14 +17481,15 @@ class basic_json
@sa http://msgpack.org
@sa http://msgpack.org
@sa @ref to_msgpack(const basic_json&) for the analogous serialization
@sa @ref to_msgpack(const basic_json&) for the analogous serialization
@sa @ref from_cbor(detail::input_adapter, const bool
) for the related CBOR
@sa @ref from_cbor(detail::input_adapter, const bool
, const bool) for the
format
related CBOR
format
@sa @ref from_ubjson(detail::input_adapter, const bool
) for the related
@sa @ref from_ubjson(detail::input_adapter, const bool
, const bool) for
UBJSON format
the related
UBJSON format
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
@since version 2.0.9; parameter @a start_index since 2.1.1; changed to
consume input adapters, removed start_index parameter, and added
consume input adapters, removed start_index parameter, and added
@a strict parameter since 3.0.0
@a strict parameter since 3.0.0; added @allow_exceptions parameter
since 3.2.0
*/
*/
static
basic_json
from_msgpack
(
detail
::
input_adapter
i
,
static
basic_json
from_msgpack
(
detail
::
input_adapter
i
,
const
bool
strict
=
true
,
const
bool
strict
=
true
,
...
@@ -17500,7 +17502,7 @@ class basic_json
...
@@ -17500,7 +17502,7 @@ class basic_json
}
}
/*!
/*!
@copydoc from_msgpack(detail::input_adapter, const bool)
@copydoc from_msgpack(detail::input_adapter, const bool
, const bool
)
*/
*/
template
<
typename
A1
,
typename
A2
,
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
...
@@ -17564,12 +17566,12 @@ class basic_json
...
@@ -17564,12 +17566,12 @@ class basic_json
@sa http://ubjson.org
@sa http://ubjson.org
@sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
@sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
analogous serialization
analogous serialization
@sa @ref from_cbor(detail::input_adapter, const bool
) for the related CBOR
@sa @ref from_cbor(detail::input_adapter, const bool
, const bool) for the
format
related CBOR
format
@sa @ref from_msgpack(detail::input_adapter, const bool
) for the related
@sa @ref from_msgpack(detail::input_adapter, const bool
, const bool) for
MessagePack format
the related
MessagePack format
@since version 3.1.0
@since version 3.1.0
; added @allow_exceptions parameter since 3.2.0
*/
*/
static
basic_json
from_ubjson
(
detail
::
input_adapter
i
,
static
basic_json
from_ubjson
(
detail
::
input_adapter
i
,
const
bool
strict
=
true
,
const
bool
strict
=
true
,
...
@@ -17581,6 +17583,9 @@ class basic_json
...
@@ -17581,6 +17583,9 @@ class basic_json
return
res
?
result
:
basic_json
(
value_t
::
discarded
);
return
res
?
result
:
basic_json
(
value_t
::
discarded
);
}
}
/*!
@copydoc from_ubjson(detail::input_adapter, const bool, const bool)
*/
template
<
typename
A1
,
typename
A2
,
template
<
typename
A1
,
typename
A2
,
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
detail
::
enable_if_t
<
std
::
is_constructible
<
detail
::
input_adapter
,
A1
,
A2
>
::
value
,
int
>
=
0
>
static
basic_json
from_ubjson
(
A1
&&
a1
,
A2
&&
a2
,
static
basic_json
from_ubjson
(
A1
&&
a1
,
A2
&&
a2
,
...
...
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