diff --git a/.clang-format b/.clang-format index 68be8b4b0..d4a24da80 100644 --- a/.clang-format +++ b/.clang-format @@ -6,7 +6,7 @@ Language: Cpp # BasedOnStyle: Google AccessModifierOffset: -1 AlignAfterOpenBracket: Align -AlignConsecutiveMacros: None +#AlignConsecutiveMacros: None // Notsupported on v11 AlignConsecutiveAssignments: None AlignConsecutiveBitFields: None AlignConsecutiveDeclarations: None diff --git a/tools/check_tidy.py b/tools/check_tidy.py index e35a26138..67eb136c9 100755 --- a/tools/check_tidy.py +++ b/tools/check_tidy.py @@ -65,7 +65,7 @@ def report_error(msg, line=None): with open(file, 'r') as f: original = f.readlines() - formatted = subprocess.check_output([clang_format, '-style=Google', file]) + formatted = subprocess.check_output([clang_format, '-style=file', file]) if update: with open(file, 'w') as f: