Fix merge-conflict introduced with f8c968f

jprotze · Meinersbur · commit 03c9692d7455 · 2023-12-14T23:22:40.000-06:00
diff --git a/openmp/tools/archer/ompt-tsan.cpp b/openmp/tools/archer/ompt-tsan.cpp
@@ -1358,7 +1358,7 @@ static int ompt_tsan_initialize(ompt_function_lookup_t lookup, int device_num,
   if (!AnnotateReductionBegin) {
     AnnotateReductionBegin = AnnotateIgnoreWritesBegin;
     AnnotateReductionEnd = AnnotateIgnoreWritesEnd;
-    if (archer_flags->verbose)
+    if (__archer::archer_flags->verbose)
       std::cout << "Archer uses fallback solution for reductions: might miss some race" << std::endl;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1358,7 +1358,7 @@ static int ompt_tsan_initialize(ompt_function_lookup_t lookup, int device_num,`
`1358`	`1358`	`if (!AnnotateReductionBegin) {`
`1359`	`1359`	`AnnotateReductionBegin = AnnotateIgnoreWritesBegin;`
`1360`	`1360`	`AnnotateReductionEnd = AnnotateIgnoreWritesEnd;`
`1361`		`- if (archer_flags->verbose)`
	`1361`	`+ if (__archer::archer_flags->verbose)`
`1362`	`1362`	`std::cout << "Archer uses fallback solution for reductions: might miss some race" << std::endl;`
`1363`	`1363`	`}`
`1364`	`1364`