j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #583 from zhaohuaxishi/doxygen_error

Browse source 
fix doxygen error of basic_json::get()
This commit is contained in:
Niels Lohmann 2017-05-15 21:09:43 +02:00 committed by GitHub
commit 0f4131d138
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/json.hpp
View file

@ -3447,9 +3447,9 @@ class basic_json
This overloads is chosen if: This overloads is chosen if:
- @a ValueType is not @ref basic_json, - @a ValueType is not @ref basic_json,
- @ref json_serializer<ValueType> has a `from_json()` method of the form - @ref json_serializer<ValueType> has a `from_json()` method of the form
`void from_json(const @ref basic_json&, ValueType&)`, and `void from_json(const basic_json&, ValueType&)`, and
- @ref json_serializer<ValueType> does not have a `from_json()` method of - @ref json_serializer<ValueType> does not have a `from_json()` method of
the form `ValueType from_json(const @ref basic_json&)` the form `ValueType from_json(const basic_json&)`
@tparam ValueTypeCV the provided value type @tparam ValueTypeCV the provided value type
@tparam ValueType the returned value type @tparam ValueType the returned value type
@ -3508,7 +3508,7 @@ class basic_json
This overloads is chosen if: This overloads is chosen if:
- @a ValueType is not @ref basic_json and - @a ValueType is not @ref basic_json and
- @ref json_serializer<ValueType> has a `from_json()` method of the form - @ref json_serializer<ValueType> has a `from_json()` method of the form
`ValueType from_json(const @ref basic_json&)` `ValueType from_json(const basic_json&)`
@note If @ref json_serializer<ValueType> has both overloads of @note If @ref json_serializer<ValueType> has both overloads of
`from_json()`, this one is chosen. `from_json()`, this one is chosen.