fix merge

spencer-gre · spencer-gre · commit db6c05896f1b · 2025-11-09T15:52:07.000-08:00
diff --git a/src/c/weaver/weave/perfflow_weave_common.cpp b/src/c/weaver/weave/perfflow_weave_common.cpp
@@ -362,6 +362,7 @@ bool weave_ns::WeaveCommon::insertAdiak(Module &m, Function &f)
     return true;
 
 }
+#endif
 
 #ifdef PERFFLOWASPECT_WITH_CALIPER
 bool weave_ns::WeaveCommon::instrumentCaliper(Module &M, Function &F)

Original file line number	Diff line number	Diff line change
`@@ -362,6 +362,7 @@ bool weave_ns::WeaveCommon::insertAdiak(Module &m, Function &f)`
`362`	`362`	`return true;`
`363`	`363`
`364`	`364`	`}`
	`365`	`+#endif`
`365`	`366`
`366`	`367`	`#ifdef PERFFLOWASPECT_WITH_CALIPER`
`367`	`368`	`bool weave_ns::WeaveCommon::instrumentCaliper(Module &M, Function &F)`