Reapply clang-format. #867
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ clang-format -i -style=file \
$(find . | egrep '.*\.(h|cpp|inl)$')
BillyDonahue
commented
Jan 17, 2019
| @@ -630,7 +630,7 @@ Json::Value obj_value(Json::objectValue); // {} | |||
|
|
|||
| void setComment(const char* text, size_t len); | |||
|
|
|||
| char* comment_{nullptr}; | |||
| char* comment_{ nullptr }; | |||
There was a problem hiding this comment.
I don't really like this behavior, but it's what our .clang-format specifies so we'd better either accept it or change our .clang-format file.
There was a problem hiding this comment.
I have no preference, except for consistency. The status-quo is fine.
I'll also use clang-format in the future to maintain style consistency.
BillyDonahue
commented
Jan 17, 2019
| @@ -2354,14 +2354,22 @@ JSONTEST_FIXTURE(CharReaderAllowSpecialFloatsTest, issue209) { | |||
| JSONCPP_STRING in; | |||
| }; | |||
| const TestData test_data[] = { | |||
| { __LINE__, true, "{\"a\":9}" }, { __LINE__, false, "{\"a\":0Infinity}" }, | |||
There was a problem hiding this comment.
These obviously need to all be on their own row. The EOL comments tell clang-format not to join them.
hjmjohnson
approved these changes
Jan 17, 2019
| @@ -630,7 +630,7 @@ Json::Value obj_value(Json::objectValue); // {} | |||
|
|
|||
| void setComment(const char* text, size_t len); | |||
|
|
|||
| char* comment_{nullptr}; | |||
| char* comment_{ nullptr }; | |||
There was a problem hiding this comment.
I have no preference, except for consistency. The status-quo is fine.
I'll also use clang-format in the future to maintain style consistency.
| @@ -2354,14 +2354,22 @@ JSONTEST_FIXTURE(CharReaderAllowSpecialFloatsTest, issue209) { | |||
| JSONCPP_STRING in; | |||
| }; | |||
| const TestData test_data[] = { | |||
| { __LINE__, true, "{\"a\":9}" }, { __LINE__, false, "{\"a\":0Infinity}" }, | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also did some manual commenting to keep test data lines from joining up,
since they rely on
__LINE__to be meaningful.