Skip to content

Evolve auto_ptr<gen::PdfInfo>-to-unique_ptr read rules to avoid std::auto_ptr #49593

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
cmsbuild merged 2 commits into from
Dec 17, 2025
Merged

Evolve auto_ptr<gen::PdfInfo>-to-unique_ptr read rules to avoid std::auto_ptr #49593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9486a64
Fix LHEEventProduct auto_ptr<PdfInfo> read rule to cover all previous…
makortel Dec 10, 2025
54bdaa5
Evolve auto_ptr<PdfInfo>-to-unique_ptr read rules to avoid std::auto_ptr
makortel Dec 10, 2025
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
16 changes: 16 additions & 0 deletions SimDataFormats/GeneratorProducts/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,19 @@ namespace hepmc_rootio {
}
}
} // namespace hepmc_rootio

// needed for backwards compatibility for auto_ptr<gen::PdfInfo>
namespace pdfinfo_autoptr_rootio {
// Following the pattern in DataFormats/TestObjects/src/classes.h
template <typename T>
struct deprecated_auto_ptr {
// We use compat_auto_ptr only to assign the wrapped raw pointer
// to a unique pointer in an I/O customization rule.
// Therefore, we don't delete on destruction (because ownership
// gets transferred to the unique pointer).

// ~deprecated_auto_ptr() { delete _M_ptr; }

T* _M_ptr = nullptr;
};
} // namespace pdfinfo_autoptr_rootio
11 changes: 6 additions & 5 deletions SimDataFormats/GeneratorProducts/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@
<class name="gen::PdfInfo" ClassVersion="10">
<version ClassVersion="10" checksum="876888052"/>
</class>
<class name="std::auto_ptr&lt;gen::PdfInfo&gt;"/>
<class name="pdfinfo_autoptr_rootio::deprecated_auto_ptr<gen::PdfInfo>"/>
<ioread sourceClass="std::auto_ptr<gen::PdfInfo>" targetClass="pdfinfo_autoptr_rootio::deprecated_auto_ptr<gen::PdfInfo>"/>

<!-- GenRunInfoProduct -->

Expand Down Expand Up @@ -193,8 +194,8 @@
<version ClassVersion="11" checksum="4154339631"/>
<version ClassVersion="10" checksum="2479857328"/>
</class>
<ioread sourceClass = "GenEventInfoProduct" version="[-11]" targetClass="GenEventInfoProduct" source = "std::auto_ptr<gen::PdfInfo> pdf_;" target="pdf_">
<![CDATA[pdf_.reset(onfile.pdf_.get()); onfile.pdf_.release();]]>
<ioread sourceClass = "GenEventInfoProduct" version="[-11]" targetClass="GenEventInfoProduct" source = "pdfinfo_autoptr_rootio::deprecated_auto_ptr<gen::PdfInfo> pdf_;" target="pdf_">
<![CDATA[pdf_.reset(onfile.pdf_._M_ptr); onfile.pdf_._M_ptr = nullptr;]]>
</ioread>
<ioread sourceClass = "GenEventInfoProduct" version="[-10]" targetClass="GenEventInfoProduct" source = "" target="nMEPartons_">
<![CDATA[nMEPartons_ = -1;]]>
Expand Down Expand Up @@ -241,8 +242,8 @@
<version ClassVersion="14" checksum="905719452"/>
<version ClassVersion="15" checksum="898288635"/>
</class>
<ioread sourceClass = "LHEEventProduct" version="[13]" targetClass="LHEEventProduct" source = "std::auto_ptr<gen::PdfInfo> pdf_;" target="pdf_">
<![CDATA[pdf_.reset(onfile.pdf_.get()); onfile.pdf_.release();]]>
<ioread sourceClass = "LHEEventProduct" version="[-13]" targetClass="LHEEventProduct" source = "pdfinfo_autoptr_rootio::deprecated_auto_ptr<gen::PdfInfo> pdf_;" target="pdf_">
<![CDATA[pdf_.reset(onfile.pdf_._M_ptr); onfile.pdf_._M_ptr = nullptr;]]>
</ioread>
<ioread sourceClass = "LHEEventProduct" version="[-12]" targetClass="LHEEventProduct" source = "" target="npLO_">
<![CDATA[npLO_ = -99;]]>
Expand Down