Skip to content

Commit

Permalink
Merge branch 'igk/format'
Browse files Browse the repository at this point in the history
  • Loading branch information
isabelgk committed Aug 2, 2024
2 parents 1470366 + 894df9e commit cf998ac
Show file tree
Hide file tree
Showing 46 changed files with 9,433 additions and 9,204 deletions.
74 changes: 35 additions & 39 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,45 +1,41 @@
BasedOnStyle: WebKit
SortIncludes: false
ColumnLimit: 140
UseTab: ForContinuationAndIndentation
TabWidth: 4
---
BasedOnStyle: LLVM
IndentWidth: 4
IndentAccessModifiers: false
ColumnLimit: 0

BreakBeforeBraces: Attach

Cpp11BracedListStyle: true
AllowShortFunctionsOnASingleLine: Empty
AlwaysBreakTemplateDeclarations: true
SpaceAfterTemplateKeyword: false
ConstructorInitializerIndentWidth: 0

NamespaceIndentation: All
CompactNamespaces: true
FixNamespaceComments: true

SpacesBeforeTrailingComments: 4
---
Language: Cpp
DerivePointerAlignment: false
PointerAlignment: Left
Cpp11BracedListStyle: false
BreakBeforeBinaryOperators: NonAssignment
IndentCaseLabels: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: AllIfsAndElse
AllowShortFunctionsOnASingleLine: Inline
SortIncludes: Never

BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: true
BeforeElse: true
IndentBraces: false
SplitEmptyFunction: false
BraceWrapping:
AfterClass: true
AfterCaseLabel: true
AfterControlStatement: MultiLine
AfterEnum: true
AfterFunction: true
AfterStruct: true
AfterUnion: true
BeforeElse: true
SplitEmptyRecord: false
SplitEmptyNamespace: false
SplitEmptyFunction: true

AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: true
AlignEscapedNewlines: Right
AlignTrailingComments: true

IndentCaseLabels: true
MaxEmptyLinesToKeep: 2
BreakInheritanceList: BeforeComma
BreakConstructorInitializers: BeforeComma
InsertBraces: true
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: 1
PackConstructorInitializers: CurrentLine
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# clang-format
5d2bff12c860d1470527d7780f26a8a4a60c19d3
4 changes: 2 additions & 2 deletions include/c74_min.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
// The use of __has_include on Windows requires VS version 15.3 which is not yet available
// Alternatively defined C74_USE_MIN_LIB using CMake
#if defined(C74_USE_MIN_LIB)
#include "../../min-lib/include/c74_lib.h"
#include "../../min-lib/include/c74_lib.h"
#elif __has_include("../../min-lib/include/c74_lib.h")
#include "../../min-lib/include/c74_lib.h"
#include "../../min-lib/include/c74_lib.h"
#endif

#define UNUSED(x) ((void)x)
Expand Down
Loading

0 comments on commit cf998ac

Please sign in to comment.