r196929 - Remove IndentBlocks, which sneaked winto the previous commit

[Alexander Kornienko]

Author: alexfh
Date: Tue Dec 10 09:46:42 2013
New Revision: 196929

URL: http://llvm.org/viewvc/llvm-project?rev=196929&view=rev
Log:
Remove IndentBlocks, which sneaked winto the previous commit

Modified:
    cfe/trunk/include/clang/Format/Format.h
    cfe/trunk/lib/Format/Format.cpp

Modified: cfe/trunk/include/clang/Format/Format.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Format/Format.h?rev=196929&r1=196928&r2=196929&view=diff
==============================================================================
--- cfe/trunk/include/clang/Format/Format.h (original)
+++ cfe/trunk/include/clang/Format/Format.h Tue Dec 10 09:46:42 2013
@@ -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 &&

Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=196929&r1=196928&r2=196929&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Tue Dec 10 09:46:42 2013
@@ -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;
 }