mzeren-vmw added inline comments.
================ Comment at: lib/Format/UnwrappedLineParser.cpp:244 PPBranchLevel = -1; - IfNdefCondition = nullptr; - FoundIncludeGuardStart = false; - IncludeGuardRejected = false; + IncludeGuard = IG_Inited; + IncludeGuardToken = nullptr; ---------------- Hm. From self review, I think this should be: IncludeGuard = Style.IndentPPDirectives == FormatStyle::PPDIS_None ? IG_Rejected : IG_Inited; ================ Comment at: lib/Format/UnwrappedLineParser.cpp:736 bool MaybeIncludeGuard = IfNDef; - if (!IncludeGuardRejected && !FoundIncludeGuardStart && MaybeIncludeGuard) { + if (IncludeGuard == IG_Inited && MaybeIncludeGuard) { for (auto &Line : Lines) { ---------------- technically I could drop the braces opened on this line. Would you like me to do that? Repository: rC Clang https://reviews.llvm.org/D42035 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits