Skip to content

[io] Make case values constant expressions [v6.26] #11178

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
merged 1 commit into from
Aug 12, 2022
Merged

[io] Make case values constant expressions [v6.26] #11178

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
24 changes: 12 additions & 12 deletions io/io/src/TGenCollectionStreamer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,13 +389,13 @@ void TGenCollectionStreamer::ReadObjects(int nElements, TBuffer &b, const TClass
switch (fVal->fCase) {
case kIsClass:
DOLOOP(b.StreamObject(i, fVal->fType, onFileValClass ));
case EProperty(kBIT_ISSTRING):
case kBIT_ISSTRING:
DOLOOP(i->read_std_string(b));
case EProperty(kIsPointer | kIsClass):
case kIsPointer | kIsClass:
DOLOOP(i->set(b.ReadObjectAny(fVal->fType)));
case EProperty(kIsPointer | kBIT_ISSTRING):
case kIsPointer | kBIT_ISSTRING:
DOLOOP(i->read_std_string_pointer(b));
case EProperty(kIsPointer | kBIT_ISTSTRING | kIsClass):
case kIsPointer | kBIT_ISTSTRING | kIsClass:
DOLOOP(i->read_tstring_pointer(vsn3, b));
}
#undef DOLOOP
Expand Down Expand Up @@ -442,20 +442,20 @@ void TGenCollectionStreamer::ReadObjects(int nElements, TBuffer &b, const TClass
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
fDestruct(fEnv->fStart,fEnv->fSize);
break;
case EProperty(kBIT_ISSTRING):
case kBIT_ISSTRING:
DOLOOP(i->read_std_string(b))
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
fDestruct(fEnv->fStart,fEnv->fSize);
break;
case EProperty(kIsPointer | kIsClass):
case kIsPointer | kIsClass:
DOLOOP(i->set(b.ReadObjectAny(fVal->fType)));
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
break;
case EProperty(kIsPointer | kBIT_ISSTRING):
case kIsPointer | kBIT_ISSTRING:
DOLOOP(i->read_std_string_pointer(b))
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
break;
case EProperty(kIsPointer | kBIT_ISTSTRING | kIsClass):
case kIsPointer | kBIT_ISTSTRING | kIsClass:
DOLOOP(i->read_tstring_pointer(vsn3, b));
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
break;
Expand Down Expand Up @@ -864,16 +864,16 @@ void TGenCollectionStreamer::ReadMap(int nElements, TBuffer &b, const TClass *on
case kIsClass:
b.StreamObject(i, v->fType);
break;
case EProperty(kBIT_ISSTRING):
case kBIT_ISSTRING:
i->read_std_string(b);
break;
case EProperty(kIsPointer | kIsClass):
case kIsPointer | kIsClass:
i->set(b.ReadObjectAny(v->fType));
break;
case EProperty(kIsPointer | kBIT_ISSTRING):
case kIsPointer | kBIT_ISSTRING:
i->read_std_string_pointer(b);
break;
case EProperty(kIsPointer | kBIT_ISTSTRING | kIsClass):
case kIsPointer | kBIT_ISTSTRING | kIsClass:
i->read_tstring_pointer(vsn3, b);
break;
}
Expand Down