Skip to content

Commit 364b54a

Browse files
mrtineideknopers8
andauthored
Add fully qualified names for std::string and std::map (#2590)
* Add fully qualified names for std::string and std::map The header TJAlienCredentials.h polluted the global namespace, included usually with CCDB or something related. See AliceO2Group/AliceO2#14524 for more background. This commit prepares for the removal of the polluted namespace. The libraries/repo with TJAlienCredentials is JAliEn-ROOT and libjalieno2. The problem was first noticed by @vkucera. * fix clang-format --------- Co-authored-by: Piotr Konopka <piotr.jan.konopka@cern.ch>
1 parent f88df8a commit 364b54a

32 files changed

+99
-99
lines changed

Modules/CTP/src/CTPTrendingTask.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void CTPTrendingTask::initCTP(Trigger& t)
6060
// o2::ctp::CTPConfiguration CTPconfig = o2::ctp::CTPRunManager::getConfigFromCCDB(t.timestamp, run, ok);
6161
auto& mgr = o2::ccdb::BasicCCDBManager::instance();
6262
mgr.setURL(CCDBHost);
63-
map<string, string> metadata; // can be empty
63+
std::map<std::string, std::string> metadata; // can be empty
6464
metadata["runNumber"] = run;
6565
mgr.setFatalWhenNull(false);
6666
auto ctpconfigdb = mgr.getSpecific<o2::ctp::CTPConfiguration>(o2::ctp::CCDBPathCTPConfig, t.timestamp, metadata);
@@ -80,11 +80,11 @@ void CTPTrendingTask::initCTP(Trigger& t)
8080
}
8181

8282
for (int i = 0; i < 5; i++) {
83-
mClassNames[i] = getFromExtendedConfig<string>(t.activity, mCustomParameters, mClassParameters[i], mClassNamesDefault[i]);
83+
mClassNames[i] = getFromExtendedConfig<std::string>(t.activity, mCustomParameters, mClassParameters[i], mClassNamesDefault[i]);
8484
if (mClassNames[i] == "") {
8585
mClassNames[i] = mClassNamesDefault[i];
8686
}
87-
mInputNames[i] = getFromExtendedConfig<string>(t.activity, mCustomParameters, mInputParameters[i], mInputNamesDefault[i]);
87+
mInputNames[i] = getFromExtendedConfig<std::string>(t.activity, mCustomParameters, mInputParameters[i], mInputNamesDefault[i]);
8888
if (mInputNames[i] == "") {
8989
mInputNames[i] = mInputNamesDefault[i];
9090
}

Modules/CTP/src/RawDataQcTask.cxx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ void CTPRawDataReaderTask::startOfActivity(const Activity& activity)
8080
mRunNumber = activity.mId;
8181
mTimestamp = activity.mValidity.getMin();
8282

83-
std::string readCTPConfig = getFromExtendedConfig<string>(activity, mCustomParameters, "readCTPconfigInMonitorData", "false");
83+
std::string readCTPConfig = getFromExtendedConfig<std::string>(activity, mCustomParameters, "readCTPconfigInMonitorData", "false");
8484
if (readCTPConfig == "true") {
8585
mReadCTPconfigInMonitorData = true;
8686
}
8787

88-
mMBclassName = getFromExtendedConfig<string>(activity, mCustomParameters, "MBclassName", "CMTVX-B-NOPF");
88+
mMBclassName = getFromExtendedConfig<std::string>(activity, mCustomParameters, "MBclassName", "CMTVX-B-NOPF");
8989

9090
std::string run = std::to_string(mRunNumber);
9191
std::string ccdbName = mCustomParameters["ccdbName"];
@@ -98,7 +98,7 @@ void CTPRawDataReaderTask::startOfActivity(const Activity& activity)
9898
bool ok;
9999
auto& mgr = o2::ccdb::BasicCCDBManager::instance();
100100
mgr.setURL(ccdbName);
101-
map<string, string> metadata; // can be empty
101+
std::map<std::string, std::string> metadata; // can be empty
102102
metadata["runNumber"] = run;
103103
auto ctpconfigdb = mgr.getSpecific<o2::ctp::CTPConfiguration>(o2::ctp::CCDBPathCTPConfig, mTimestamp, metadata);
104104
if (ctpconfigdb == nullptr) {
@@ -130,8 +130,8 @@ void CTPRawDataReaderTask::startOfActivity(const Activity& activity)
130130
mHistoClassRatios->SetTitle(Form("Class Ratio to %s", mMBclassName.c_str()));
131131
}
132132

133-
std::string nameInput1 = getFromExtendedConfig<string>(activity, mCustomParameters, "MB1inputName", "MTVX");
134-
std::string nameInput2 = getFromExtendedConfig<string>(activity, mCustomParameters, "MB2inputName", "MT0A");
133+
std::string nameInput1 = getFromExtendedConfig<std::string>(activity, mCustomParameters, "MB1inputName", "MTVX");
134+
std::string nameInput2 = getFromExtendedConfig<std::string>(activity, mCustomParameters, "MB2inputName", "MT0A");
135135

136136
auto input1Tokens = o2::utils::Str::tokenize(nameInput1, ':', false, true);
137137
if (input1Tokens.size() > 0) {
@@ -206,7 +206,7 @@ void CTPRawDataReaderTask::startOfActivity(const Activity& activity)
206206
mHistoBCMinBias2->SetTitle(Form("%s; %s; %s", title2.Data(), titleX2.Data(), titley2.Data()));
207207
mHistoInputRatios->SetTitle(Form("Input Ratio to %s", nameInput1.c_str()));
208208

209-
std::string performConsistencyCheck = getFromExtendedConfig<string>(activity, mCustomParameters, "consistencyCheck", "true");
209+
std::string performConsistencyCheck = getFromExtendedConfig<std::string>(activity, mCustomParameters, "consistencyCheck", "true");
210210
if (performConsistencyCheck == "true") {
211211
mDecoder.setCheckConsistency(1);
212212
mDecoder.setDecodeInps(1);

Modules/Common/src/CcdbInspectorTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ std::tuple<uint64_t, uint64_t, uint64_t, int> CcdbInspectorTask::getObjectInfo(c
154154

155155
void* CcdbInspectorTask::getObject(const std::string& path, std::type_info const& tinfo, uint64_t timestamp, const std::map<std::string, std::string>& metadata)
156156
{
157-
map<string, string> headers;
157+
std::map<std::string, std::string> headers;
158158
void* obj = mDatabase->retrieveAny(tinfo, path, metadata, timestamp, &headers);
159159
ILOG(Debug, Devel) << "Retrieved '" << path << "' from db '" << mDatabaseUrl << "' for timestamp " << timestamp << ENDM;
160160

Modules/FIT/FDD/src/DigitQcTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ void DigitQcTask::initialize(o2::framework::InitContext& /*ctx*/)
411411

412412
for (int i = 0; i < getObjectsManager()->getNumberPublishedObjects(); i++) {
413413
TH1* obj = dynamic_cast<TH1*>(getObjectsManager()->getMonitorObject(i)->getObject());
414-
obj->SetTitle((string("FDD ") + obj->GetTitle()).c_str());
414+
obj->SetTitle((std::string("FDD ") + obj->GetTitle()).c_str());
415415
}
416416
// Timestamp
417417
mMetaAnchorOutput = o2::quality_control_modules::common::getFromConfig<std::string>(mCustomParameters, "metaAnchorOutput", "CycleDurationNTF");

Modules/FIT/FDD/src/DigitQcTaskLaser.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void DigitQcTaskLaser::initialize(o2::framework::InitContext& /*ctx*/)
208208

209209
for (int i = 0; i < getObjectsManager()->getNumberPublishedObjects(); i++) {
210210
TH1* obj = dynamic_cast<TH1*>(getObjectsManager()->getMonitorObject(i)->getObject());
211-
obj->SetTitle((string("FDD Laser ") + obj->GetTitle()).c_str());
211+
obj->SetTitle((std::string("FDD Laser ") + obj->GetTitle()).c_str());
212212
}
213213
}
214214

Modules/FIT/FDD/src/PostProcTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void PostProcTask::initialize(Trigger, framework::ServiceRegistryRef services)
276276
for (int i = 0; i < getObjectsManager()->getNumberPublishedObjects(); i++) {
277277
TH1* obj = dynamic_cast<TH1*>(getObjectsManager()->getMonitorObject(i)->getObject());
278278
if (obj != nullptr) {
279-
obj->SetTitle((string("FDD ") + obj->GetTitle()).c_str());
279+
obj->SetTitle((std::string("FDD ") + obj->GetTitle()).c_str());
280280
}
281281
}
282282

Modules/FIT/FT0/src/DigitQcTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void DigitQcTask::initialize(o2::framework::InitContext& /*ctx*/)
228228

229229
for (int i = 0; i < getObjectsManager()->getNumberPublishedObjects(); i++) {
230230
TH1* obj = dynamic_cast<TH1*>(getObjectsManager()->getMonitorObject(i)->getObject());
231-
obj->SetTitle((string("FT0 ") + obj->GetTitle()).c_str());
231+
obj->SetTitle((std::string("FT0 ") + obj->GetTitle()).c_str());
232232
}
233233
//
234234
mGoodPMbits_ChID = o2::quality_control_modules::common::getFromConfig<int>(mCustomParameters, "goodPMbits_ChID", 1 << o2::ft0::ChannelData::kIsCFDinADCgate);

Modules/FIT/FV0/src/DigitQcTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void DigitQcTask::initialize(o2::framework::InitContext& /*ctx*/)
372372

373373
for (int i = 0; i < getObjectsManager()->getNumberPublishedObjects(); i++) {
374374
TH1* obj = dynamic_cast<TH1*>(getObjectsManager()->getMonitorObject(i)->getObject());
375-
obj->SetTitle((string("FV0 ") + obj->GetTitle()).c_str());
375+
obj->SetTitle((std::string("FV0 ") + obj->GetTitle()).c_str());
376376
}
377377
// Timestamp
378378
mMetaAnchorOutput = o2::quality_control_modules::common::getFromConfig<std::string>(mCustomParameters, "metaAnchorOutput", "CycleDurationNTF");

Modules/FIT/FV0/src/DigitQcTaskLaser.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ void DigitQcTaskLaser::initialize(o2::framework::InitContext& /*ctx*/)
304304

305305
for (int i = 0; i < getObjectsManager()->getNumberPublishedObjects(); i++) {
306306
TH1* obj = dynamic_cast<TH1*>(getObjectsManager()->getMonitorObject(i)->getObject());
307-
obj->SetTitle((string("FV0 Laser ") + obj->GetTitle()).c_str());
307+
obj->SetTitle((std::string("FV0 Laser ") + obj->GetTitle()).c_str());
308308
}
309309
}
310310

Modules/FIT/FV0/src/PostProcTask.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ void PostProcTask::initialize(Trigger, framework::ServiceRegistryRef services)
303303
for (int i = 0; i < getObjectsManager()->getNumberPublishedObjects(); i++) {
304304
TH1* obj = dynamic_cast<TH1*>(getObjectsManager()->getMonitorObject(i)->getObject());
305305
if (obj != nullptr) {
306-
obj->SetTitle((string("FV0 ") + obj->GetTitle()).c_str());
306+
obj->SetTitle((std::string("FV0 ") + obj->GetTitle()).c_str());
307307
}
308308
}
309309

0 commit comments

Comments
 (0)