Skip to content

Commit 6d83b02

Browse files
committed
Merge bitcoin/bitcoin#23493: Use c++17 in clang-format
faeb748 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 faeb748 - we do have some Objc code, but it never changes. Tree-SHA512: 50215849b3992e5841b45b281e68d4c58184a365cbaeec0d7adad844ad21672ae1b6247262047e2d7427835ef98fa9d9f83335696448c77303dde9ab0a121639
2 parents 04ae20a + faeb748 commit 6d83b02

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

src/.clang-format

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ IndentWidth: 4
3434
KeepEmptyLinesAtTheStartOfBlocks: false
3535
MaxEmptyLinesToKeep: 2
3636
NamespaceIndentation: None
37-
ObjCSpaceAfterProperty: false
38-
ObjCSpaceBeforeProtocolList: false
39-
PenaltyBreakBeforeFirstCallParameter: 1
40-
PenaltyBreakComment: 300
41-
PenaltyBreakFirstLessLess: 120
42-
PenaltyBreakString: 1000
43-
PenaltyExcessCharacter: 1000000
44-
PenaltyReturnTypeOnItsOwnLine: 200
4537
PointerAlignment: Left
4638
SpaceBeforeAssignmentOperators: true
4739
SpaceBeforeParens: ControlStatements
@@ -51,6 +43,5 @@ SpacesInAngles: false
5143
SpacesInContainerLiterals: true
5244
SpacesInCStyleCastParentheses: false
5345
SpacesInParentheses: false
54-
Standard: Cpp11
55-
TabWidth: 8
46+
Standard: c++17
5647
UseTab: Never

0 commit comments

Comments
 (0)