Backport variable precision feature to 0.y.z #408
Conversation
For now use hardcoded precision '17' for now
adding precision as settings value for StreamBuilder Conflicts: src/lib_json/json_writer.cpp
Conflicts: src/test_lib_json/main.cpp
|
I'll look at it this weekend. We'll probably accept the code as-is, but I generally cherry-pick to that branch rather than confuse the merge-history. Thanks for submitting. |
|
@cdunn2001 I'm not sure what you mean. I cherry-picked the commits between the branches. Did you want me to rebase them so they are all one commit? |
|
No, I mean that I won't hit the Merge pull request button. I don't want a merge-commit. I'll just rebase your commits onto the 0.y.z branch. No time today though. |
|
Ah, I see. I cherry-picked these on top of the latest 0.y.z ( https://github.com/KarateSnowMachine/jsoncpp/commits/0.y.z ) so they should apply directly on top of your 0.y.z without any conflicts. I thought I read somewhere that github won't generate a merge commit if the merge is fast-forward-able. I might be thinking of something else. Anyways, no rush. I'm using my own jsoncpp fork as upstream for now. |
Definitely not GitHub. Actually, I think it's a good idea to rebase commits and create a merge commit. The history is much cleaner that way, and the merge-commits have diffs in only one direction. Anyway, yes, this should be easy for me this weekend. Thanks. |
|
I agree. I like to do this on my pull requests at work (rebase and then merge) -- though I've shot myself in the foot a few times when someone pulls my PR branch into their PR branch and then I rebase it before I merge to master. |
|
Rebased and pushed. Thanks! |
This was a reasonably trivial cherry-pick. Confirmed that it builds and the precision test case passes.