diff --git a/.clang-format-2 b/.clang-format-2 index aab4665d6..41591ce34 100644 --- a/.clang-format-2 +++ b/.clang-format-2 @@ -1,4 +1,5 @@ BasedOnStyle: Google +AllowShortFunctionsOnASingleLine: Inline ColumnLimit: 100 CommentPragmas: NOLINT:.* DerivePointerAlignment: false diff --git a/.clang-format-4 b/.clang-format-4 index 1497447fe..ae4a45135 100644 --- a/.clang-format-4 +++ b/.clang-format-4 @@ -1,5 +1,6 @@ BasedOnStyle: Google AccessModifierOffset: -2 +AllowShortFunctionsOnASingleLine: Inline ColumnLimit: 100 CommentPragmas: NOLINT:.* DerivePointerAlignment: false