Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix doxygen error of basic_json::get() #583

Merged
merged 2 commits into from
May 15, 2017
Merged

fix doxygen error of basic_json::get() #583

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfa371c
fix doxygen error of basic_json::get()
zhaohuaxishi May 13, 2017
b8dff3b
remove the redundant @ref command
zhaohuaxishi May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/json.hpp
View file
Open in desktop
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