Author: Zachary Henkel Date: 2021-05-04T11:19:54-04:00 New Revision: 54bff1522fc863329894d875d54c2fe4cd1b4f3f
URL: https://github.com/llvm/llvm-project/commit/54bff1522fc863329894d875d54c2fe4cd1b4f3f DIFF: https://github.com/llvm/llvm-project/commit/54bff1522fc863329894d875d54c2fe4cd1b4f3f.diff LOG: Rename a template parameter that conflicted with a common macro; NFC The CALLBACK macro is used extensively in the Windows SDK. Added: Modified: clang/include/clang/Analysis/CFG.h Removed: ################################################################################ diff --git a/clang/include/clang/Analysis/CFG.h b/clang/include/clang/Analysis/CFG.h index a0f8c6d21a674..9e32eb8e066a9 100644 --- a/clang/include/clang/Analysis/CFG.h +++ b/clang/include/clang/Analysis/CFG.h @@ -1389,13 +1389,12 @@ class CFG { // Member templates useful for various batch operations over CFGs. //===--------------------------------------------------------------------===// - template <typename CALLBACK> - void VisitBlockStmts(CALLBACK& O) const { + template <typename Callback> void VisitBlockStmts(Callback &O) const { for (const_iterator I = begin(), E = end(); I != E; ++I) for (CFGBlock::const_iterator BI = (*I)->begin(), BE = (*I)->end(); BI != BE; ++BI) { if (Optional<CFGStmt> stmt = BI->getAs<CFGStmt>()) - O(const_cast<Stmt*>(stmt->getStmt())); + O(const_cast<Stmt *>(stmt->getStmt())); } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
