Remove IndentBlocks, which sneaked winto the previous commit

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196929 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h
index 49e6909f7ecfffd0c8ee7fdd9f23b80d5ffd30b9..7af5a094511f64725439060a63e6998b012aa906 100644 (file)
--- a/include/clang/Format/Format.h
+++ b/include/clang/Format/Format.h
@@ -94,10 +94,6 @@ struct FormatStyle {
   /// <tt>A<A<int> ></tt> instead of \c A<A<int>> for LS_Cpp03.
   LanguageStandard Standard;
 
-  /// \brief When \c true, blocks (including braces) get an additional level of
-  /// indentation.
-  bool IndentBlocks;
-
   /// \brief Indent case labels one level from the switch statement.
   ///
   /// When \c false, use the same indentation level as for the switch statement.
@@ -312,7 +308,6 @@ struct FormatStyle {
            DerivePointerBinding == R.DerivePointerBinding &&
            ExperimentalAutoDetectBinPacking ==
                R.ExperimentalAutoDetectBinPacking &&
-           IndentBlocks == R.IndentBlocks &&
            IndentCaseLabels == R.IndentCaseLabels &&
            IndentFunctionDeclarationAfterType ==
                R.IndentFunctionDeclarationAfterType &&

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 4225178405c5c5955f8ab4ebe2a57f8d1cda6350..808e64db915585cd4545eec4b79cc97ca6efcef6 100644 (file)
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -256,7 +256,6 @@ FormatStyle getLLVMStyle() {
   LLVMStyle.Cpp11BracedListStyle = false;
   LLVMStyle.DerivePointerBinding = false;
   LLVMStyle.ExperimentalAutoDetectBinPacking = false;
-  LLVMStyle.IndentBlocks = false;
   LLVMStyle.IndentCaseLabels = false;
   LLVMStyle.IndentFunctionDeclarationAfterType = false;
   LLVMStyle.IndentWidth = 2;
@@ -363,7 +362,6 @@ FormatStyle getGNUStyle() {
   Style.BreakBeforeBraces = FormatStyle::BS_Allman;
   Style.BreakBeforeTernaryOperators = true;
   Style.ColumnLimit = 79;
-  Style.IndentBlocks = true;
   Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
   return Style;
 }