Skip to content

Added emitUTF8 setting. #1045

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

Merged
merged 10 commits into from
Oct 17, 2019
Merged

Added emitUTF8 setting. #1045

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c341593
Added emitUTF8 setting to emit UTF8 format JSON.
nicolaswilson Oct 8, 2019
ff0c411
Added a test for emitUTF8, with it in default, on and off states.
nicolaswilson Oct 9, 2019
0121241
Review comments addressed.
nicolaswilson Oct 13, 2019
0f932d3
Merge branch 'master' into utf-8
nicolaswilson Oct 13, 2019
5c51175
Merged master into my branch & resolved conflicts.
nicolaswilson Oct 13, 2019
32554d2
Fix clang-format errors.
nicolaswilson Oct 14, 2019
9e93f9b
Fix clang-format errors.
nicolaswilson Oct 15, 2019
c6e5d8d
Fixed clang-format errors.
nicolaswilson Oct 15, 2019
0f8df23
Fixed clang-format errors.
nicolaswilson Oct 15, 2019
60594e0
Merge branch 'master' into utf-8
baylesj Oct 15, 2019
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
Prev Previous commit
Next Next commit
Merge branch 'master' into utf-8
  • Loading branch information
@nicolaswilson
nicolaswilson authored Oct 13, 2019
commit 0f932d3492c06773f449885f14ac5d0dc6895327
4 changes: 4 additions & 0 deletions src/lib_json/json_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,10 @@ BuiltStyledStreamWriter::BuiltStyledStreamWriter(String indentation,
bool emitUTF8,
unsigned int precision,
PrecisionType precisionType)
BuiltStyledStreamWriter::BuiltStyledStreamWriter(
String indentation, CommentStyle::Enum cs, String colonSymbol,
String nullSymbol, String endingLineFeedSymbol, bool useSpecialFloats,
unsigned int precision, PrecisionType precisionType)
: rightMargin_(74), indentation_(std::move(indentation)), cs_(cs),
colonSymbol_(std::move(colonSymbol)), nullSymbol_(std::move(nullSymbol)),
endingLineFeedSymbol_(std::move(endingLineFeedSymbol)),
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.