Skip to content

[6.40] Fix TDataMember::GetOptions() #23778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linev merged 1 commit into from
Oct 23, 2026
Merged

[6.40] Fix TDataMember::GetOptions() #23778

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions core/meta/src/TDataMember.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,8 @@ void TDataMember::ExtractOptionsFromComment()
//having all options extracted and put into list, we finally can parse
//them to create a list of options...

auto enumDict = IsEnum() ? TEnum::GetEnum(GetTypeName()) : nullptr;

fOptions = new TList(); //create the list

TIter next(optionlist.get()); //we'll iterate through all
Expand Down Expand Up @@ -803,11 +805,10 @@ void TDataMember::ExtractOptionsFromComment()
// We'll try to find global enum existing in ROOT...
l = (Long_t)(*value);
} else if (IsEnum()) {
TObject *obj = fClass->GetListOfDataMembers(false)->FindObject(ptr1);
if (obj)
l = ((TEnumConstant *)obj)->GetValue();
if (auto enumConst = enumDict ? (TEnumConstant*) enumDict->GetConstants()->FindObject(ptr1) : nullptr)
l = enumConst->GetValue();
else
l = gInterpreter->Calc(Form("%s;", ptr1));
l = gInterpreter->Calc(TString::Format("%s;", ptr1));
} else {
Fatal("TDataMember", "Internal error, couldn't recognize enum/global value %s.", ptr1);
}
Expand Down
Loading