diff options
| author | fanquake <fanquake@gmail.com> | 2021-11-14 11:03:32 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-11-14 11:03:42 +0800 |
| commit | 6d83b026196efb3252a8254b123ad66b1017d952 (patch) | |
| tree | 5b0fb9dec36eed21e73bb5e32f0b44941e12abc6 /src | |
| parent | 04ae20ae136c3c98485177d6a3b07e139a8cd534 (diff) | |
| parent | faeb748f5bd88b4de734fea40e94edbbaf8a79fd (diff) | |
Merge bitcoin/bitcoin#23493: Use c++17 in clang-format
faeb748f5bd88b4de734fea40e94edbbaf8a79fd Use c++17 in clang-format (MarcoFalke)
Pull request description:
We currently use `Cpp11`, which "is a deprecated alias for `Latest`" according to https://clang.llvm.org/docs/ClangFormatStyleOptions.html . I doubt this has any effect, but I think for clarity setting to `c++17` make sense.
Also, remove unneeded settings:
* `ObjC*`, as we don't write objc code
* `Penalty`, as there is currently no line limit, so this has no effect
* `TabWidth`, as we don't use tabs
ACKs for top commit:
fanquake:
ACK faeb748f5bd88b4de734fea40e94edbbaf8a79fd - we do have some Objc code, but it never changes.
Tree-SHA512: 50215849b3992e5841b45b281e68d4c58184a365cbaeec0d7adad844ad21672ae1b6247262047e2d7427835ef98fa9d9f83335696448c77303dde9ab0a121639
Diffstat (limited to 'src')
| -rw-r--r-- | src/.clang-format | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/.clang-format b/src/.clang-format index a69c57f3e0..791b3b8f9f 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -34,14 +34,6 @@ IndentWidth: 4 KeepEmptyLinesAtTheStartOfBlocks: false MaxEmptyLinesToKeep: 2 NamespaceIndentation: None -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: false -PenaltyBreakBeforeFirstCallParameter: 1 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 200 PointerAlignment: Left SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements @@ -51,6 +43,5 @@ SpacesInAngles: false SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false -Standard: Cpp11 -TabWidth: 8 +Standard: c++17 UseTab: Never |