summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-12-14 08:24:16 +0000
committerDaniel Jasper <djasper@google.com>2015-12-14 08:24:16 +0000
commite87f5cf4ef419fb837efc04185bb54ee61272ff3 (patch)
tree61cd749f51b6892ccd399fe5413180ed9d7b4866 /clang/lib/Format
parent7b69ca0281881b2a65e103953d81ccba87a6caa3 (diff)
downloadbcm5719-llvm-e87f5cf4ef419fb837efc04185bb54ee61272ff3.tar.gz
bcm5719-llvm-e87f5cf4ef419fb837efc04185bb54ee61272ff3.zip
clang-format: Fix style default for WebKit and Linux styles.
Brought up in codereviews: http://reviews.llvm.org/D15445 http://reviews.llvm.org/D15485 llvm-svn: 255484
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/Format.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index d66145fd885..896ecad60f5 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -396,7 +396,6 @@ static FormatStyle expandPresets(const FormatStyle &Style) {
Expanded.BraceWrapping.AfterClass = true;
Expanded.BraceWrapping.AfterFunction = true;
Expanded.BraceWrapping.AfterNamespace = true;
- Expanded.BraceWrapping.BeforeElse = true;
break;
case FormatStyle::BS_Mozilla:
Expanded.BraceWrapping.AfterClass = true;
@@ -427,7 +426,6 @@ static FormatStyle expandPresets(const FormatStyle &Style) {
break;
case FormatStyle::BS_WebKit:
Expanded.BraceWrapping.AfterFunction = true;
- Expanded.BraceWrapping.BeforeElse = true;
break;
default:
break;
OpenPOWER on IntegriCloud