From e65fa0a892e617edf59ff2f3468cbd2fc4ff6101 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 12 Dec 2016 14:49:21 -0800 Subject: clang-format: Adjust short functions / if settings. http://clang.llvm.org/docs/ClangFormatStyleOptions.html AllowShortFunctionsOnASingleLine: Empty Empty functions like "int f() {}" can be put on a single line. AllowShortIfStatementsOnASingleLine: true If true, "if (a) return;" can be put on a single line. Test: N/A Change-Id: Ia4f411a958235ab18d16972f2c9d0f55b645b4ba --- .clang-format | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.clang-format') diff --git a/.clang-format b/.clang-format index b8c642840..532278864 100644 --- a/.clang-format +++ b/.clang-format @@ -1,6 +1,7 @@ BasedOnStyle: Google AllowShortBlocksOnASingleLine: false -AllowShortFunctionsOnASingleLine: false +AllowShortFunctionsOnASingleLine: Empty +AllowShortIfStatementsOnASingleLine: true ColumnLimit: 100 CommentPragmas: NOLINT:.* -- cgit v1.2.3