Skip to content

Commit 198e61b

Browse files
authored
[NFC]: Rename a template parameter conflict with CALLBACK macro (microsoft#6759)
This imports upstream commit llvm/llvm-project@54bff15 This fixes the following compiler error with clang 18.1.8 with mingw-w64 toolchain. CFG.h:916:22: error: expected a qualified name after 'typename' 916 | template <typename CALLBACK> | ^ minwindef.h:90:18: note: expanded from macro 'CALLBACK' 90 | #define CALLBACK __stdcall | ^
1 parent a2a220b commit 198e61b

File tree

1 file changed

+1
-2
lines changed
  • tools/clang/include/clang/Analysis

1 file changed

+1
-2
lines changed

tools/clang/include/clang/Analysis/CFG.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,7 @@ class CFG {
913913
// Member templates useful for various batch operations over CFGs.
914914
//===--------------------------------------------------------------------===//
915915

916-
template <typename CALLBACK>
917-
void VisitBlockStmts(CALLBACK& O) const {
916+
template <typename Callback> void VisitBlockStmts(Callback &O) const {
918917
for (const_iterator I=begin(), E=end(); I != E; ++I)
919918
for (CFGBlock::const_iterator BI=(*I)->begin(), BE=(*I)->end();
920919
BI != BE; ++BI) {

0 commit comments

Comments
 (0)