[ntuple] Remove ROOT7 guard from RemoveRNTupleSubFields

Author: silverweed

Diff for: tree/dataframe/inc/ROOT/RDF/InterfaceUtils.hxx

@@ -813,10 +813,7 @@ AddSizeBranches(const std::vector<std::string> &branches, ROOT::RDF::RDataSource
                 std::vector<std::string> &&colsWithoutAliases, std::vector<std::string> &&colsWithAliases);
 
 void RemoveDuplicates(ColumnNames_t &columnNames);
-
-#ifdef R__HAS_ROOT7
 void RemoveRNTupleSubFields(ColumnNames_t &columnNames);
-#endif
 
 } // namespace RDF
 } // namespace Internal

Diff for: tree/dataframe/inc/ROOT/RDF/RLoopManager.hxx

@@ -351,7 +351,6 @@ std::shared_ptr<ROOT::Detail::RDF::RLoopManager>
 CreateLMFromTTree(std::string_view datasetName, const std::vector<std::string> &fileNameGlobs,
                   const std::vector<std::string> &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<ROOT::Detail::RDF::RLoopManager> CreateLMFromFile(std::string_vi
 std::shared_ptr<ROOT::Detail::RDF::RLoopManager> CreateLMFromFile(std::string_view datasetName,
                                                                   const std::vector<std::string> &fileNameGlobs,
                                                                   const std::vector<std::string> &defaultColumns);
-#endif
 
 } // namespace RDF
 } // namespace Detail

Diff for: tree/dataframe/test/dataframe_snapshot_emptyoutput.cxx

@@ -6,6 +6,8 @@
 
 #include <ROOT/RDataFrame.hxx>
 
+#include <thread>
+
 class RDFManyBranchTypesTTree : public ::testing::TestWithParam<std::pair<bool, bool>> {
 protected:
    inline constexpr static auto fgNEvents = 10u;