From a11c814d3da58735792e0651457410e3d913852c Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Tue, 28 Mar 2017 12:31:37 -0700 Subject: [PATCH] Only allow short functions in class definitions. The previous rules would force short functions to be on a single line. This change only allows single function lines in class definitions. Test: Ran on a CL and verified single line functions only allowed in Test: class defintions. Change-Id: I5422543fdbb39da842bbd799c19fe2c443ff483c --- .clang-format-2 | 1 + .clang-format-4 | 1 + 2 files changed, 2 insertions(+) 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