commit e65fa0a892e617edf59ff2f3468cbd2fc4ff6101
author Tao Bao <tbao@google.com> Mon Dec 12 14:49:21 2016 -0800
committer Tao Bao <tbao@google.com> Mon Dec 12 15:00:52 2016 -0800
tree 9c805c72007ccb32b3e20e523a03e569bd6afc03
parent 594dc4f5be6effa97f1a2b87879790f1f7e65970

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

diff --git a/.clang-format b/.clang-format
index b8c6428..5322788 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:.*