zahen created this revision.
zahen requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Rename LLVM's single use of CALLBACK as a template parameter to work around the 
Windows SDK `#define CALLBACK __stdcall`

I'm sympathetic to the Michael Bolton argument but these are the only 2 lines 
affected in all of LLVM.

Once accepted I'll need someone to commit the change on my behalf.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D101776

Files:
  clang/include/clang/Analysis/CFG.h


Index: clang/include/clang/Analysis/CFG.h
===================================================================
--- clang/include/clang/Analysis/CFG.h
+++ clang/include/clang/Analysis/CFG.h
@@ -1389,8 +1389,8 @@
   // Member templates useful for various batch operations over CFGs.
   
//===--------------------------------------------------------------------===//
 
-  template <typename CALLBACK>
-  void VisitBlockStmts(CALLBACK& O) const {
+  template <typename CALLBACKFN>
+  void VisitBlockStmts(CALLBACKFN& 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) {


Index: clang/include/clang/Analysis/CFG.h
===================================================================
--- clang/include/clang/Analysis/CFG.h
+++ clang/include/clang/Analysis/CFG.h
@@ -1389,8 +1389,8 @@
   // Member templates useful for various batch operations over CFGs.
   //===--------------------------------------------------------------------===//
 
-  template <typename CALLBACK>
-  void VisitBlockStmts(CALLBACK& O) const {
+  template <typename CALLBACKFN>
+  void VisitBlockStmts(CALLBACKFN& 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) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to