Skip to content

Commit cb0357c

Browse files
Update TListHandler.h
1 parent 1766627 commit cb0357c

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

Common/Tools/TListHandler.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ namespace o2::framework
4141
// Many methods/definitions/parts of code are taken from HistogramRegisty.h and HistogramRegistry.cxx
4242
//--------------------------------------------------------------------------------------------------
4343
//--------------------------------------------------------------------------------------------------
44-
// template <uint32_t BitMask>
44+
//ToDo :: create templated class to keep the BitMask modifiable and declrable at compile time. // template <uint32_t BitMask>
4545
class TListHandler
4646
{
4747

4848
struct HistName {
4949
// ctor for histogram names that are already hashed at compile time via HIST("myHistName")
5050
template <char... chars>
51-
explicit constexpr HistName(const ConstStr<chars...>& hashedHistName);
51+
constexpr HistName(const ConstStr<chars...>& hashedHistName);
5252
char const* const str{};
5353
const uint32_t hash{};
5454
const uint32_t idx{};
5555

5656
protected:
5757
friend class TListHandler;
5858
// ctor that does the hashing at runtime (for internal use only)
59-
explicit constexpr HistName(char const* const name);
59+
constexpr HistName(char const* const name);
6060
};
6161

6262
public:
@@ -384,10 +384,10 @@ void TListHandler::insertInNestedTList(const std::string& name, const HistPtr hi
384384
TString dirPathT(dirPath.c_str());
385385
TObjArray* folders = dirPathT.Tokenize('/');
386386
for (int i = 0; i < folders->GetEntries(); ++i) {
387-
TString subdir = reinterpret_cast<TObjString*>(folders->At(i))->GetString();
387+
TString subdir = (static_cast<TObjString*>(folders->At(i)))->GetString();
388388
TObject* existingObj = parentList->FindObject(subdir);
389389
if (existingObj && existingObj->InheritsFrom(TList::Class())) {
390-
subList = reinterpret_cast<TList*>(existingObj);
390+
subList = static_cast<TList*>(existingObj);
391391
} else {
392392
subList = new TList();
393393
subList->SetName(subdir);
@@ -399,7 +399,7 @@ void TListHandler::insertInNestedTList(const std::string& name, const HistPtr hi
399399
}
400400

401401
TNamed* rawPtrToObj = nullptr;
402-
std::visit([&](const auto& sharedPtr) { rawPtrToObj = reinterpret_cast<TNamed*>(sharedPtr.get()); }, tObj);
402+
std::visit([&](const auto& sharedPtr) { rawPtrToObj = (TNamed*)sharedPtr.get(); }, tObj);
403403
rawPtrToObj->SetName(histName.c_str());
404404
}
405405

@@ -526,7 +526,7 @@ const TList* getRootSubList(TList* rootList, std::string dirPath)
526526
TString dirPathT(dirPath.c_str());
527527
TObjArray* folders = dirPathT.Tokenize('/');
528528
for (int i = 0; i < folders->GetEntries(); ++i) {
529-
TString subdir = reinterpret_cast<TObjString*>(folders->At(i))->GetString();
529+
TString subdir = (static_cast<TObjString*>(folders->At(i)))->GetString();
530530
TObject* existingObj = parentList->FindObject(subdir);
531531
if (existingObj && existingObj->InheritsFrom(TList::Class())) {
532532
parentList = static_cast<const TList*>(existingObj);
@@ -585,7 +585,7 @@ void TListHandler::addClone(const std::string& source, const std::string& target
585585
if (!sharedPtr.get()) {
586586
return;
587587
}
588-
std::string sourceName{reinterpret_cast<TNamed*>(sharedPtr.get())->GetName()};
588+
std::string sourceName{(static_cast<TNamed*>(sharedPtr.get()))->GetName()};
589589
// search for histograms starting with source_ substring
590590
if (sourceName.rfind(source, 0) == 0) {
591591
// when cloning groups of histograms source_ and target_ must end with "/"
@@ -628,7 +628,7 @@ double TListHandler::getSize(double fillFraction)
628628
if (hist) {
629629
size += HistFiller::getSize(hist, fillFraction);
630630
}
631-
},
631+
},
632632
mTListValue[j]);
633633
}
634634
return size;

0 commit comments

Comments
 (0)