This repository has been archived by the owner on Dec 10, 2020. It is now read-only.
merge the latest state from upstream #18
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
…nd improve messaging This re-integrates 3ef03cd back.
…d/make-version Fix failure of retrieving git hash from a hg-git enabled repository
Fixed work of mod_sort_oc_properties with sp_after_comma
Fixes for obj properties
Code appears first time in space.cpp:1039
Removes tests 30310 and 30311 as the new options are activated or the used example code. The option 'sp_word_brace' is most likely now obsolete in C++ code but it might be used in other languages.
…shandled Bugfix for uncrustify#1041
Deletions and reordering only, no real changes.
indent_ctor_init and indent_ctor_init_leading should apply only to member initialization lists in constructor as their name suggests, not to base classes list.
Add options for unnamed temporary direct-list-initializations
Add support for char literal prefixes
Add C++14 digit-separator support
Split the logic into two separate 'if' commands (for either a base classes list or a member initialization list) rather than existing nested conditions.
This was referenced Sep 28, 2017
|
I'm just doing skimming of the various PRs here to make sure there is nothing obviously wrong, and approving the ones I can. It would be good to see the green CI job. |
|
And here are the links to finally finished CI builds:
Ready for review. |
dirk-thomas
added
in review
clalancette
approved these changes
Sep 29, 2017
|
And as a follow up the newly referenced PRs remove plenty of
Please review the newly referenced PR. |
This was referenced Sep 29, 2017
|
all referenced changes look good to me once ci comes back green |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Pulling in over a year of bug fixes and improvements.