Skip to content

Fix FORM's RNTuple backend build against ROOT 6.40 #749

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
gemmeren merged 1 commit into from
Jul 22, 2026
Merged

Fix FORM's RNTuple backend build against ROOT 6.40 #749

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
17 changes: 16 additions & 1 deletion form/root_storage/root_rntuple_write_container.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include "storage/storage_write_association.hpp"

#include "RVersion.h"

#include <memory>
#include <string>

Expand All @@ -14,15 +16,28 @@ namespace ROOT {
class RNTupleWriter;
class RNTupleModel;

#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 40, 0)
namespace Detail {
class RRawPtrWriteEntry;
}
#else
namespace Experimental {
namespace Detail {
class RRawPtrWriteEntry;
}
}
#endif
}

namespace form::detail::experimental {

//ROOT 6.40 moved RRawPtrWriteEntry from ROOT::Experimental::Detail to ROOT::Detail.
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 40, 0)
using RRawPtrWriteEntry = ROOT::Detail::RRawPtrWriteEntry;
#else
using RRawPtrWriteEntry = ROOT::Experimental::Detail::RRawPtrWriteEntry;
#endif

class ROOT_RNTuple_Write_ContainerImp : public Storage_Write_Association {
public:
ROOT_RNTuple_Write_ContainerImp(std::string const& name);
Expand All @@ -43,7 +58,7 @@ namespace form::detail::experimental {
//State shared by ROOT_RField_ContainerImps
std::unique_ptr<ROOT::RNTupleWriter> m_writer;
std::unique_ptr<ROOT::RNTupleModel> m_model;
std::unique_ptr<ROOT::Experimental::Detail::RRawPtrWriteEntry> m_entry;
std::unique_ptr<RRawPtrWriteEntry> m_entry;
};
}

Expand Down
Loading