updated .clang-format and .clang-tidy

This commit is contained in:
Moritz Gmeiner 2024-03-02 14:09:19 +01:00
commit 7ea1b2bada
2 changed files with 4 additions and 6 deletions

View file

@ -7,8 +7,11 @@ ColumnLimit: 100
Language: Cpp Language: Cpp
AllowShortFunctionsOnASingleLine: Inline AllowShortFunctionsOnASingleLine: Inline
AllowShortBlocksOnASingleLine: Empty
IndentCaseLabels: false IndentCaseLabels: false
DerivePointerAlignment: false DerivePointerAlignment: false
PointerAlignment: Left PointerAlignment: Left
SeparateDefinitionBlocks: Always

View file

@ -11,7 +11,6 @@ Checks: '
performance-*, performance-*,
readability-*, readability-*,
<<<<<<< HEAD
-bugprone-easily-swappable-parameters, -bugprone-easily-swappable-parameters,
-cppcoreguidelines-avoid-magic-numbers, -cppcoreguidelines-avoid-magic-numbers,
@ -19,10 +18,6 @@ Checks: '
-google-objc-function-naming, -google-objc-function-naming,
-google-readability-todo, -google-readability-todo,
||||||| e0a9d73
=======
-cppcoreguidelines-avoid-magic-numbers,
>>>>>>> f1af0a699020eeef4d24ac8186e577752169e2c6
-misc-no-recursion, -misc-no-recursion,
-modernize-use-nodiscard, -modernize-use-nodiscard,