Revert "[ROOT6] RPageSinkFile is now in ROOT::Experimental::Internal …

…namespace"
cms-sw · Feb 22, 2024 · 3fd2023 · 3fd2023
1 parent 306f63b
commit 3fd2023
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc b/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc
@@ -19,13 +19,12 @@
 #include <ROOT/RPageStorageFile.hxx>
 using ROOT::Experimental::RNTupleModel;
 using ROOT::Experimental::RNTupleWriteOptions;
+using ROOT::Experimental::Detail::RPageSinkFile;
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
 using ROOT::Experimental::RNTupleWriter;
-using ROOT::Experimental::Detail::RPageSinkFile;
 #define MakeRNTupleWriter std::make_unique<RNTupleWriter>
 #else
 #define MakeRNTupleWriter ROOT::Experimental::Internal::CreateRNTupleWriter
-using ROOT::Experimental::Internal::RPageSinkFile;
 #endif
 
 #include "TObjString.h"

diff --git a/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTuples.cc b/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTuples.cc
@@ -9,13 +9,12 @@
 #include <ROOT/RPageStorageFile.hxx>
 using ROOT::Experimental::RNTupleModel;
 using ROOT::Experimental::RNTupleWriteOptions;
+using ROOT::Experimental::Detail::RPageSinkFile;
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
 using ROOT::Experimental::RNTupleWriter;
-using ROOT::Experimental::Detail::RPageSinkFile;
 #define MakeRNTupleWriter std::make_unique<RNTupleWriter>
 #else
 #define MakeRNTupleWriter ROOT::Experimental::Internal::CreateRNTupleWriter
-using ROOT::Experimental::Internal::RPageSinkFile;
 #endif
 
 #include "RNTupleFieldPtr.h"