[PATCH] D21279: Fix some issues in clang-format's AlignConsecutive modes

[Daphne Pfister via Phabricator via cfe-commits]

daphnediane added a comment.

Rebuilt with the latest patch and got one compile error. See line comment worked okay after fixing it.



================
Comment at: lib/Format/WhitespaceManager.cpp:215
+
+    if (i != Start) {
+      if (Changes[i].nestingAndIndentLevel() >
----------------
These ifs can get merged again, when you merged my changes in it was based on a version before you merged them.


================
Comment at: lib/Format/WhitespaceManager.h:157
+    std::pair<unsigned, unsigned>
+    WhitespaceManager::Change::nestingAndIndentLevel() const {
+      return std::make_pair(Tok->NestingLevel, Tok->IndentLevel);
----------------
Extra WhitespaceManager::Change:: prefix here


https://reviews.llvm.org/D21279