commit ead41b6b8fa50d93bc21cad2c8d195dcfc7cb9cb
author Daniel Jasper <djasper@google.com> Thu Feb 28 09:39:12 2013 +0000
committer Daniel Jasper <djasper@google.com> Thu Feb 28 09:39:12 2013 +0000
tree db4d3dbdfe64303fe896dde142fd7d0ad969ebe9
parent d8ffcfa9b87c9d08022cc916d41044d2d18e2cfd

Fix incorrect recognition of bin-packing.

Before (in Google style):
Constructor()
    : aaaaa(aaaaaa), aaaaa(aaaaaa), aaaaa(aaaaaa), aaaaa(aaaaaa), aaaaa(
          aaaaaa) {}

After:
Constructor()
    : aaaaa(aaaaaa),
      aaaaa(aaaaaa),
      aaaaa(aaaaaa),
      aaaaa(aaaaaa),
      aaaaa(aaaaaa) {}

llvm-svn: 176242

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index ea96b8f..e3f7b4b 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -654,7 +654,8 @@
         AvoidBinPacking = false;
       } else {
         NewIndent = 4 + State.Stack.back().LastSpace;
-        AvoidBinPacking = !Style.BinPackParameters;
+        AvoidBinPacking =
+            !Style.BinPackParameters || State.Stack.back().AvoidBinPacking;
       }
       State.Stack.push_back(
           ParenState(NewIndent, State.Stack.back().LastSpace, AvoidBinPacking,