Merge pull request cms-sw#36686 from Dr15Jones/oneapi_common

cmsbuild · web-flow · commit bb2e40ea7870 · 2022-01-12T16:08:04.000+01:00
Move common code to use oneapi/tbb headers
diff --git a/CommonTools/Utils/interface/MethodInvoker.h b/CommonTools/Utils/interface/MethodInvoker.h
@@ -11,7 +11,7 @@
 #include <map>
 #include <vector>
 
-#include "tbb/concurrent_unordered_map.h"
+#include "oneapi/tbb/concurrent_unordered_map.h"
 
 namespace edm {
   struct TypeIDHasher {
diff --git a/DataFormats/PatCandidates/src/TriggerObjectStandAlone.cc b/DataFormats/PatCandidates/src/TriggerObjectStandAlone.cc
@@ -1,4 +1,4 @@
-#include <tbb/concurrent_unordered_map.h>
+#include <oneapi/tbb/concurrent_unordered_map.h>
 #include <boost/algorithm/string.hpp>
 
 #include "DataFormats/Common/interface/TriggerResults.h"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <tbb/concurrent_unordered_map.h>`
	`1`	`+#include <oneapi/tbb/concurrent_unordered_map.h>`
`2`	`2`	`#include <boost/algorithm/string.hpp>`
`3`	`3`
`4`	`4`	`#include "DataFormats/Common/interface/TriggerResults.h"`