Skip to content

Commit

Permalink
Merge pull request #583 from zhaohuaxishi/doxygen_error
Browse files Browse the repository at this point in the history
fix doxygen error of basic_json::get()
  • Loading branch information
nlohmann authored May 15, 2017
2 parents 0c3ffe1 + b8dff3b commit 0f4131d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3447,9 +3447,9 @@ class basic_json
This overloads is chosen if:
- @a ValueType is not @ref basic_json,
- @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
the form `ValueType from_json(const @ref basic_json&)`
the form `ValueType from_json(const basic_json&)`
@tparam ValueTypeCV the provided value type
@tparam ValueType the returned value type
Expand Down Expand Up @@ -3508,7 +3508,7 @@ class basic_json
This overloads is chosen if:
- @a ValueType is not @ref basic_json and
- @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
`from_json()`, this one is chosen.
Expand Down

0 comments on commit 0f4131d

Please sign in to comment.