Skip to content

[core] Add TGenericClassInfo::AdoptMemberStreamer() #20736

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

Open
silverweed wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −1
Open

[core] Add TGenericClassInfo::AdoptMemberStreamer() #20736

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions core/meta/inc/TGenericClassInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "TSchemaHelper.h"
#include <vector>
#include <string>
#include <unordered_map>

// Forward declarations
class TVirtualIsAProxy;
Expand Down Expand Up @@ -72,6 +73,7 @@ namespace ROOT {
std::vector<ROOT::Internal::TSchemaHelper> fReadRules;
std::vector<ROOT::Internal::TSchemaHelper> fReadRawRules;
std::vector<ROOT::TClassAlt*> fAlternate;
std::unordered_map<std::string, TMemberStreamer *> fAdoptedMemberStreamers;

public:
TGenericClassInfo(const char *fullClassname,
Expand Down Expand Up @@ -118,6 +120,7 @@ namespace ROOT {
TClass *IsA(const void *obj);

void AdoptAlternate(ROOT::TClassAlt *alt);
void AdoptMemberStreamer(const char *name, TMemberStreamer *strm);
Short_t AdoptStreamer(TClassStreamer*);
Short_t AdoptCollectionProxy(TVirtualCollectionProxy*);
void AdoptCollectionProxyInfo(Detail::TCollectionProxyInfo*);
Expand Down
21 changes: 20 additions & 1 deletion core/meta/src/TGenericClassInfo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,11 @@ namespace Internal {
fClass->SetConvStreamerFunc(fConvStreamerFunc);
fClass->SetMerge(fMerge);
fClass->SetResetAfterMerge(fResetAfterMerge);
fClass->AdoptStreamer(fStreamer); fStreamer = nullptr;
fClass->AdoptStreamer(fStreamer);
fStreamer = nullptr;
for (const auto &[name, strm] : fAdoptedMemberStreamers)
fClass->AdoptMemberStreamer(name.c_str(), strm);
fAdoptedMemberStreamers.clear();
// If IsZombie is true, something went wrong and we will not be
// able to properly copy the collection proxy
if (!fClass->IsZombie()) {
Expand Down Expand Up @@ -434,6 +438,21 @@ namespace Internal {
fAlternate.push_back(alt);
}

void TGenericClassInfo::AdoptMemberStreamer(const char *name, TMemberStreamer *strm)
{
if (fClass) {
assert(fAdoptedMemberStreamers.empty());
fClass->AdoptMemberStreamer(name, strm);
return;
}

auto [it, inserted] = fAdoptedMemberStreamers.emplace(name, strm);
if (!inserted) {
delete it->second;
it->second = strm;
}
}

void TGenericClassInfo::AdoptCollectionProxyInfo(TCollectionProxyInfo *info)
{
// Set the info for the CollectionProxy and take ownership of the object
Expand Down
Loading