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.

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

add ensure_ascii parameter to dump. #330 #654

Merged
merged 3 commits into from
Jul 12, 2017
Merged

add ensure_ascii parameter to dump. #330 #654

merged 3 commits into from
Jul 12, 2017

Conversation

ryanjmulder
Copy link
Contributor

No description provided.

src/json.hpp Outdated

@param[in] indent If indent is nonnegative, then array elements and object
members will be pretty-printed with that indent level. An indent level of
`0` will only insert newlines. `-1` (the default) selects the most compact
representation.
@param[in] indent_char The character to use for indentation if @a indent is
greater than `0`. The default is ` ` (space).
@param[in] ensure_ascii If ensure_ascii is true (the default), all non-ASCII
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default in the function declaration is false.

Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice PR. Please have a look at the required changes.

src/json.hpp Outdated

@return string containing the serialization of the JSON value

@complexity Linear.

@liveexample{The following example shows the effect of different @a indent
parameters to the result of the serialization.,dump}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The , here is required. It separates the description (The following example...) from the name of the example dump (see file doc/examples/dump.cpp).

Please undo this change.

Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@nlohmann
Copy link
Owner

Thanks for the PR! Let's wait for Travis/Coveralls to finish.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 40461c6 on ryanjmulder:develop into 7dee868 on nlohmann:develop.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 486f3a2 on ryanjmulder:develop into 7dee868 on nlohmann:develop.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling 486f3a2 on ryanjmulder:develop into 7dee868 on nlohmann:develop.

@nlohmann nlohmann self-assigned this Jul 12, 2017
@nlohmann nlohmann added this to the Release 3.0.0 milestone Jul 12, 2017
@nlohmann nlohmann merged commit dad4916 into nlohmann:develop Jul 12, 2017
@nlohmann
Copy link
Owner

Thanks a lot!

@ryanjmulder
Copy link
Contributor Author

ryanjmulder commented Jul 12, 2017 via email

@nlohmann
Copy link
Owner

@ryanjmulder Unfortunately, I found an error in the code, see #656. Maybe you have an idea how to fix it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants