Skip to content

Commit ba2e54b

Browse files
committed
thread-safety: return const* for getDTConfigBti and getDTConfigTraco too
1 parent 6407681 commit ba2e54b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

L1TriggerConfig/DTTPGConfig/interface/DTConfigManager.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ class DTConfigManager {
7070
~DTConfigManager();
7171

7272
//! Get desired BTI configuration
73-
DTConfigBti* getDTConfigBti(DTBtiId) const;
73+
const DTConfigBti* getDTConfigBti(DTBtiId) const;
7474

7575
//! Get desired BTI configuration map for a given DTChamber
7676
const std::map<DTBtiId,DTConfigBti>& getDTConfigBtiMap(DTChamberId) const;
7777

7878
//! Get desired TRACO configuration
79-
DTConfigTraco* getDTConfigTraco(DTTracoId) const;
79+
const DTConfigTraco* getDTConfigTraco(DTTracoId) const;
8080

8181
//! Get desired TRACO configuration map for a given DTChamber
8282
const std::map<DTTracoId,DTConfigTraco>& getDTConfigTracoMap(DTChamberId) const;

L1TriggerConfig/DTTPGConfig/src/DTConfigManager.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ DTConfigManager::~DTConfigManager(){
6060
// Operations --
6161
//--------------
6262

63-
DTConfigBti* DTConfigManager::getDTConfigBti(DTBtiId btiid) const {
63+
const DTConfigBti* DTConfigManager::getDTConfigBti(DTBtiId btiid) const {
6464

6565
DTChamberId chambid = btiid.SLId().chamberId();
6666
BtiMap::const_iterator biter1 = my_btimap.find(chambid);
@@ -82,7 +82,7 @@ DTConfigBti* DTConfigManager::getDTConfigBti(DTBtiId btiid) const {
8282
<< ") not found, return 0" << std::endl;
8383
return 0;
8484
}
85-
return const_cast<DTConfigBti*>(&(*biter2).second);
85+
return &(*biter2).second;
8686

8787
}
8888

@@ -100,7 +100,7 @@ const std::map<DTBtiId,DTConfigBti>& DTConfigManager::getDTConfigBtiMap(DTChambe
100100

101101
}
102102

103-
DTConfigTraco* DTConfigManager::getDTConfigTraco(DTTracoId tracoid) const {
103+
const DTConfigTraco* DTConfigManager::getDTConfigTraco(DTTracoId tracoid) const {
104104

105105
DTChamberId chambid = tracoid.ChamberId();
106106
TracoMap::const_iterator titer1 = my_tracomap.find(chambid);
@@ -121,7 +121,7 @@ DTConfigTraco* DTConfigManager::getDTConfigTraco(DTTracoId tracoid) const {
121121
<< ") not found, return a reference to the end of the map" << std::endl;
122122
return 0;
123123
}
124-
return const_cast<DTConfigTraco*>(&(*titer2).second);
124+
return &(*titer2).second;
125125

126126
}
127127

0 commit comments

Comments
 (0)