diff --git a/tree/dataframe/inc/ROOT/RDF/InterfaceUtils.hxx b/tree/dataframe/inc/ROOT/RDF/InterfaceUtils.hxx index 0904f2a0c6f15..373c526496058 100644 --- a/tree/dataframe/inc/ROOT/RDF/InterfaceUtils.hxx +++ b/tree/dataframe/inc/ROOT/RDF/InterfaceUtils.hxx @@ -813,10 +813,7 @@ AddSizeBranches(const std::vector &branches, ROOT::RDF::RDataSource std::vector &&colsWithoutAliases, std::vector &&colsWithAliases); void RemoveDuplicates(ColumnNames_t &columnNames); - -#ifdef R__HAS_ROOT7 void RemoveRNTupleSubFields(ColumnNames_t &columnNames); -#endif } // namespace RDF } // namespace Internal diff --git a/tree/dataframe/inc/ROOT/RDF/RLoopManager.hxx b/tree/dataframe/inc/ROOT/RDF/RLoopManager.hxx index ea972b78ca85d..12eeef517592c 100644 --- a/tree/dataframe/inc/ROOT/RDF/RLoopManager.hxx +++ b/tree/dataframe/inc/ROOT/RDF/RLoopManager.hxx @@ -351,7 +351,6 @@ std::shared_ptr CreateLMFromTTree(std::string_view datasetName, const std::vector &fileNameGlobs, const std::vector &defaultColumns, bool checkFile = true); -#ifdef R__HAS_ROOT7 /// \brief Create an RLoopManager that reads an RNTuple. /// \param[in] datasetName Name of the RNTuple /// \param[in] fileNameGlob File name (or glob) in which the RNTuple is stored. @@ -393,7 +392,6 @@ std::shared_ptr CreateLMFromFile(std::string_vi std::shared_ptr CreateLMFromFile(std::string_view datasetName, const std::vector &fileNameGlobs, const std::vector &defaultColumns); -#endif } // namespace RDF } // namespace Detail diff --git a/tree/dataframe/test/dataframe_snapshot_emptyoutput.cxx b/tree/dataframe/test/dataframe_snapshot_emptyoutput.cxx index 3bdfd30388a12..14dfd5c508cc2 100644 --- a/tree/dataframe/test/dataframe_snapshot_emptyoutput.cxx +++ b/tree/dataframe/test/dataframe_snapshot_emptyoutput.cxx @@ -6,6 +6,8 @@ #include +#include + class RDFManyBranchTypesTTree : public ::testing::TestWithParam> { protected: inline constexpr static auto fgNEvents = 10u;