Skip to content

Commit

Permalink
Merge branch 'v7.3' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
albin-johansson committed Jun 15, 2023
2 parents 41ea21a + adc6045 commit 8b1d974
Show file tree
Hide file tree
Showing 436 changed files with 10,166 additions and 79,450 deletions.
21 changes: 5 additions & 16 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ IndentWidth: 2
DerivePointerAlignment: false
PointerAlignment: Left

IndentRequires: true
IndentRequiresClause: true

NamespaceIndentation: None
FixNamespaceComments: true
Expand All @@ -23,7 +23,7 @@ AllowAllConstructorInitializersOnNextLine: false
BinPackParameters: false
BinPackArguments: false

AllowShortFunctionsOnASingleLine: All
AllowShortFunctionsOnASingleLine: InlineOnly
AllowShortIfStatementsOnASingleLine: Never
AllowShortBlocksOnASingleLine: Empty
AllowShortLambdasOnASingleLine: All
Expand All @@ -34,20 +34,9 @@ BreakBeforeBinaryOperators: None
BreakBeforeTernaryOperators: true
BreakBeforeConceptDeclarations: true

BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterStruct: true
AfterUnion: false
AfterEnum: true
AfterFunction: true
AfterExternBlock: true
AfterCaseLabel: false
BeforeElse: true
BeforeCatch: true
SplitEmptyNamespace: false
SplitEmptyRecord: false
SplitEmptyFunction: false
BreakBeforeBraces: Stroustrup

BreakInheritanceList: BeforeComma
BreakConstructorInitializers: BeforeComma

SpaceBeforeCpp11BracedList: true
4 changes: 0 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto

doxygen/** linguist-documentation
docs/** linguist-documentation
test/lib/** linguist-vendored
Loading

0 comments on commit 8b1d974

Please sign in to comment.