Skip to content

Commit 5198675

Browse files
committed
[core] fix type of scopeNameSize
1 parent 261f1a5 commit 5198675

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

core/base/src/TListOfTypes.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static bool NameExistsElsewhere(const char* name){
6262
if (lastPos != nullptr) {
6363
// We have a scope
6464
const auto enName = lastPos + 1;
65-
const auto scopeNameSize = ((Long64_t)lastPos - (Long64_t)name) / sizeof(decltype(*lastPos)) - 1;
65+
const size_t scopeNameSize = (lastPos - name) / sizeof(decltype(*lastPos)) - 1;
6666
std::string scopeName{name, scopeNameSize};
6767
// We have now an enum name and a scope name
6868
// We look first in the classes

core/meta/src/TEnum.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ TEnum *TEnum::GetEnum(const char *enumName, ESearchAction sa)
297297
if (lastPos != enumName) {
298298
// We have a scope
299299
const auto enName = lastPos;
300-
const auto scopeNameSize = ((Long64_t)lastPos - (Long64_t)enumName) / sizeof(decltype(*lastPos)) - 2;
300+
const auto scopeNameSize = (lastPos - enumName) / sizeof(decltype(*lastPos)) - 2;
301301
std::string scopeName{enumName, scopeNameSize};
302302
// Three levels of search
303303
theEnum = searchEnum(scopeName.c_str(), enName, kNone);

core/metacling/src/TCling.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ bool TClingLookupHelper__ExistingTypeCheck(const std::string &tname,
961961
{
962962
// We have a scope
963963
const auto enName = lastPos;
964-
const auto scopeNameSize = ((Long64_t)lastPos - (Long64_t)inner) / sizeof(decltype(*lastPos)) - 2;
964+
const auto scopeNameSize = (lastPos - inner) / sizeof(decltype(*lastPos)) - 2;
965965
std::string scopeName{inner, scopeNameSize};
966966
// Check if the scope is in the list of classes
967967
if (auto scope = static_cast<TClass *>(gROOT->GetListOfClasses()->FindObject(scopeName.c_str()))) {

0 commit comments

Comments
 (0)