Skip to content

Commit

Permalink
Move DetectorDescription/Core to use oneapi/tbb headers
Browse files Browse the repository at this point in the history
The old  header declarations are deprecated in TBB
  • Loading branch information
Dr15Jones committed Jan 11, 2022
1 parent a32f01c commit 5b9d0b0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DetectorDescription/Core/interface/DDName.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <utility>

#include "FWCore/Utilities/interface/StdPairHasher.h"
#include <tbb/concurrent_vector.h>
#include <tbb/concurrent_unordered_map.h>
#include <oneapi/tbb/concurrent_vector.h>
#include <oneapi/tbb/concurrent_unordered_map.h>

class DDCurrentNamespace;

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/Core/interface/DDValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <vector>

#include "DetectorDescription/Core/interface/DDValuePair.h"
#include "tbb/concurrent_unordered_map.h"
#include "tbb/concurrent_vector.h"
#include "oneapi/tbb/concurrent_unordered_map.h"
#include "oneapi/tbb/concurrent_vector.h"
#include "FWCore/Utilities/interface/zero_allocator.h"

/** A DDValue std::maps a std::vector of DDValuePair (std::string,double) to a name. Names of DDValues are stored
Expand Down

0 comments on commit 5b9d0b0

Please sign in to comment.