[ntuple] fix-up several forward declarations

root-project · Feb 13, 2024 · 31a7e29 · 31a7e29
1 parent aa9b84e
commit 31a7e29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/tree/ntuple/v7/inc/ROOT/RField.hxx b/tree/ntuple/v7/inc/ROOT/RField.hxx
@@ -63,11 +63,12 @@ class REntry;
 
 namespace Internal {
 struct RFieldCallbackInjector;
-class RPageStorage;
+class RPageSink;
+class RPageSource;
 // TODO(jblomer): find a better way to not have these three methods in the RFieldBase public API
 void CallCommitClusterOnField(RFieldBase &);
-void CallConnectPageSinkOnField(RFieldBase &, Internal::RPageSink &, NTupleSize_t firstEntry = 0);
-void CallConnectPageSourceOnField(RFieldBase &, Internal::RPageSource &);
+void CallConnectPageSinkOnField(RFieldBase &, RPageSink &, NTupleSize_t firstEntry = 0);
+void CallConnectPageSourceOnField(RFieldBase &, RPageSource &);
 } // namespace Internal
 
 namespace Detail {

diff --git a/tree/ntuple/v7/inc/ROOT/RNTuple.hxx b/tree/ntuple/v7/inc/ROOT/RNTuple.hxx
@@ -47,8 +47,6 @@ class RNTuple;
 class RNTupleModel;
 
 namespace Internal {
-class RPageSink;
-class RPageSource;
 struct RNTupleTester; // friend of RNTuple
 } // namespace Internal
 

diff --git a/tree/ntuple/v7/inc/ROOT/RPageStorageDaos.hxx b/tree/ntuple/v7/inc/ROOT/RPageStorageDaos.hxx
@@ -33,13 +33,10 @@
 namespace ROOT {
 namespace Experimental {
 
-namespace Detail {
-class RCluster;
-class RClusterPool;
-} // namespace Detail
-
 namespace Internal {
 using ntuple_index_t = std::uint32_t;
+class RCluster;
+class RClusterPool;
 class RDaosPool;
 class RDaosContainer;
 class RPageAllocatorHeap;