diff options
| author | Daniel Jasper <djasper@google.com> | 2013-01-16 15:44:34 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-01-16 15:44:34 +0000 |
| commit | df3736aa70443ac0f33af094989b4ba88d73f568 (patch) | |
| tree | 58dee32bdd6068bca3dae7608bc59c3dffc65139 /lib/Format/Format.cpp | |
| parent | 0df6acdf4f6faf7579775a739e1c09448c076c0f (diff) | |
Disable inlining of short ifs in Google style.
Various reasons seem to speak against it, so I am disabling this for
now.
Changed tests to still test this option.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172618 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/Format.cpp')
| -rw-r--r-- | lib/Format/Format.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index f4fa6fc35f..4be41daf00 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -167,7 +167,7 @@ FormatStyle getGoogleStyle() { GoogleStyle.SpacesBeforeTrailingComments = 2; GoogleStyle.BinPackParameters = false; GoogleStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = true; - GoogleStyle.AllowShortIfStatementsOnASingleLine = true; + GoogleStyle.AllowShortIfStatementsOnASingleLine = false; GoogleStyle.ObjCSpaceBeforeProtocolList = false; GoogleStyle.ObjCSpaceBeforeReturnType = false; return GoogleStyle; |