Merge "Only allow short functions in class definitions."

2017-03-28 21:20:16 +00:00 · 2017-03-28 21:20:16 +00:00 · e3b27d22bf
parent 57d78354d6 a11c814d3d
commit e3b27d22bf
2 changed files with 2 additions and 0 deletions
--- a/.clang-format-2
+++ b/.clang-format-2
@ -1,4 +1,5 @@
 BasedOnStyle: Google
+AllowShortFunctionsOnASingleLine: Inline
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false
--- a/.clang-format-4
+++ b/.clang-format-4
@ -1,5 +1,6 @@
 BasedOnStyle: Google
 AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false