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 | ced17f8cd562ffd086ef90de02a60cfe769120b7 (patch) | |
| tree | 6304281cd41882614b9d841a1cc250e6c1230257 /clang/lib/Format/Format.cpp | |
| parent | 9278eb95e3d371e52313dfdac7653159d377a9ef (diff) | |
| download | bcm5719-llvm-ced17f8cd562ffd086ef90de02a60cfe769120b7.tar.gz bcm5719-llvm-ced17f8cd562ffd086ef90de02a60cfe769120b7.zip | |
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.
llvm-svn: 172618
Diffstat (limited to 'clang/lib/Format/Format.cpp')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index f4fa6fc35f0..4be41daf005 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/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; |
