From 7bbe0c6bda4869c31722c098cbe3f96dea0574bc Mon Sep 17 00:00:00 2001 From: silverweed Date: Mon, 17 Mar 2025 11:28:28 +0100 Subject: [PATCH] [ntuple] Move RFieldVisitor out of Experimental And move its child classes to Internal --- gui/browsable/src/RFieldProvider.hxx | 2 +- tree/ntuple/v7/inc/ROOT/RField.hxx | 20 ++--- .../v7/inc/ROOT/RField/RFieldFundamental.hxx | 24 +++--- .../ROOT/RField/RFieldProxiedCollection.hxx | 5 +- .../v7/inc/ROOT/RField/RFieldRecord.hxx | 5 +- .../v7/inc/ROOT/RField/RFieldSTLMisc.hxx | 10 +-- .../ROOT/RField/RFieldSequenceContainer.hxx | 13 ++- tree/ntuple/v7/inc/ROOT/RFieldBase.hxx | 10 +-- tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx | 18 ++-- tree/ntuple/v7/src/RField.cxx | 40 ++++----- tree/ntuple/v7/src/RFieldBase.cxx | 2 +- tree/ntuple/v7/src/RFieldMeta.cxx | 10 +-- .../ntuple/v7/src/RFieldSequenceContainer.cxx | 10 +-- tree/ntuple/v7/src/RFieldVisitor.cxx | 84 +++++++++---------- tree/ntuple/v7/src/RNTupleReader.cxx | 4 +- tree/ntuple/v7/test/ntuple_test.hxx | 4 +- 16 files changed, 124 insertions(+), 137 deletions(-) diff --git a/gui/browsable/src/RFieldProvider.hxx b/gui/browsable/src/RFieldProvider.hxx index cca39b687d90b..03aeead60dc41 100644 --- a/gui/browsable/src/RFieldProvider.hxx +++ b/gui/browsable/src/RFieldProvider.hxx @@ -39,7 +39,7 @@ using namespace std::string_literals; */ class RFieldProvider : public RProvider { - class RDrawVisitor : public ROOT::Experimental::Detail::RFieldVisitor { + class RDrawVisitor : public ROOT::Detail::RFieldVisitor { private: std::shared_ptr fNtplReader; std::unique_ptr fHist; diff --git a/tree/ntuple/v7/inc/ROOT/RField.hxx b/tree/ntuple/v7/inc/ROOT/RField.hxx index 22e8b3e09df69..c78ecd1f20f8c 100644 --- a/tree/ntuple/v7/inc/ROOT/RField.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField.hxx @@ -45,15 +45,15 @@ namespace ROOT { class TSchemaRule; +namespace Detail { +class RFieldVisitor; +} // namespace Detail + namespace Experimental { class REntry; class RNTupleCollectionView; -namespace Detail { -class RFieldVisitor; -} // namespace Detail - } // namespace Experimental /// The container field for an ntuple model, which itself has no physical representation. @@ -70,7 +70,7 @@ public: size_t GetValueSize() const final { return 0; } size_t GetAlignment() const final { return 0; } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; /// Used in RFieldBase::Check() to record field creation failures. @@ -205,7 +205,7 @@ public: size_t GetAlignment() const final { return fMaxAlignment; } std::uint32_t GetTypeVersion() const final; std::uint32_t GetTypeChecksum() const final; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; /// The field for a class using ROOT standard streaming @@ -257,7 +257,7 @@ public: size_t GetAlignment() const final; std::uint32_t GetTypeVersion() const final; std::uint32_t GetTypeChecksum() const final; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; /// The field for an unscoped or scoped enum with dictionary @@ -284,7 +284,7 @@ public: std::vector SplitValue(const RValue &value) const final; size_t GetValueSize() const final { return fSubfields[0]->GetValueSize(); } size_t GetAlignment() const final { return fSubfields[0]->GetAlignment(); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; /// Classes with dictionaries that can be inspected by TClass @@ -345,7 +345,7 @@ public: RCardinalityField &operator=(RCardinalityField &&other) = default; ~RCardinalityField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; const RField> *As32Bit() const; const RField> *As64Bit() const; @@ -497,7 +497,7 @@ public: size_t GetAlignment() const final; std::uint32_t GetTypeVersion() const final; std::uint32_t GetTypeChecksum() const final; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; // Has to be implemented after the definition of all RField types diff --git a/tree/ntuple/v7/inc/ROOT/RField/RFieldFundamental.hxx b/tree/ntuple/v7/inc/ROOT/RField/RFieldFundamental.hxx index 262a9af0899e6..b4b27b4705806 100644 --- a/tree/ntuple/v7/inc/ROOT/RField/RFieldFundamental.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField/RFieldFundamental.hxx @@ -78,7 +78,7 @@ public: RField &operator=(RField &&other) = default; ~RField() final = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -100,7 +100,7 @@ public: RField &operator=(RField &&other) = default; ~RField() final = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; // For other integral types, we introduce an intermediate RIntegralField. It is specialized for fixed-width integer @@ -127,7 +127,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -144,7 +144,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -161,7 +161,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -178,7 +178,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -195,7 +195,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -212,7 +212,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -229,7 +229,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; extern template class RSimpleField; @@ -246,7 +246,7 @@ public: RIntegralField &operator=(RIntegralField &&other) = default; ~RIntegralField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; namespace Internal { @@ -495,7 +495,7 @@ public: explicit RField(std::string_view name) : RRealField(name, TypeName()) {} - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; template <> @@ -514,7 +514,7 @@ public: explicit RField(std::string_view name) : RRealField(name, TypeName()) {} - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; // Set the column representation to 32 bit floating point and the type alias to Double32_t void SetDouble32(); diff --git a/tree/ntuple/v7/inc/ROOT/RField/RFieldProxiedCollection.hxx b/tree/ntuple/v7/inc/ROOT/RField/RFieldProxiedCollection.hxx index 980df0da69485..f16ca3867eaa7 100644 --- a/tree/ntuple/v7/inc/ROOT/RField/RFieldProxiedCollection.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField/RFieldProxiedCollection.hxx @@ -36,14 +36,11 @@ #include namespace ROOT { -namespace Experimental { namespace Detail { class RFieldVisitor; } // namespace Detail -} // namespace Experimental - /// The field for a class representing a collection of elements via `TVirtualCollectionProxy`. /// Objects of such type behave as collections that can be accessed through the corresponding member functions in /// `TVirtualCollectionProxy`. For STL collections, these proxies are provided. Custom classes need to implement the @@ -184,7 +181,7 @@ public: std::vector SplitValue(const RValue &value) const final; size_t GetValueSize() const final { return fProxy->Sizeof(); } size_t GetAlignment() const final { return alignof(std::max_align_t); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; void GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const { diff --git a/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx b/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx index bedc4c342859b..5ba5f16da7c36 100644 --- a/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx @@ -30,14 +30,11 @@ #include namespace ROOT { -namespace Experimental { namespace Detail { class RFieldVisitor; } // namespace Detail -} // namespace Experimental - namespace Internal { std::unique_ptr CreateEmulatedField(std::string_view fieldName, std::vector> itemFields, @@ -121,7 +118,7 @@ public: return std::max(1ul, fSize); } size_t GetAlignment() const final { return fMaxAlignment; } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; const std::vector &GetOffsets() const { return fOffsets; } }; diff --git a/tree/ntuple/v7/inc/ROOT/RField/RFieldSTLMisc.hxx b/tree/ntuple/v7/inc/ROOT/RField/RFieldSTLMisc.hxx index bcbe7bcfbd292..f196051b1743b 100644 --- a/tree/ntuple/v7/inc/ROOT/RField/RFieldSTLMisc.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField/RFieldSTLMisc.hxx @@ -67,7 +67,7 @@ public: size_t GetValueSize() const final { return fSubfields[0]->GetValueSize(); } size_t GetAlignment() const final { return fSubfields[0]->GetAlignment(); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; template @@ -116,7 +116,7 @@ public: size_t GetValueSize() const final { return kWordSize * ((fN + kBitsPerWord - 1) / kBitsPerWord); } size_t GetAlignment() const final { return alignof(Word_t); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; /// Get the number of bits in the bitset, i.e. the N in std::bitset std::size_t GetN() const { return fN; } @@ -155,7 +155,7 @@ public: RField &operator=(RField &&other) = default; ~RField() final = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; //////////////////////////////////////////////////////////////////////////////// @@ -190,7 +190,7 @@ public: RNullableField &operator=(RNullableField &&other) = default; ~RNullableField() override = default; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; class ROptionalField : public RNullableField { @@ -323,7 +323,7 @@ public: size_t GetValueSize() const final { return sizeof(std::string); } size_t GetAlignment() const final { return std::alignment_of(); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; //////////////////////////////////////////////////////////////////////////////// diff --git a/tree/ntuple/v7/inc/ROOT/RField/RFieldSequenceContainer.hxx b/tree/ntuple/v7/inc/ROOT/RField/RFieldSequenceContainer.hxx index 08ea0b5be71a2..ebcd617454f85 100644 --- a/tree/ntuple/v7/inc/ROOT/RField/RFieldSequenceContainer.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField/RFieldSequenceContainer.hxx @@ -29,14 +29,11 @@ #include namespace ROOT { -namespace Experimental { namespace Detail { class RFieldVisitor; } // namespace Detail -} // namespace Experimental - //////////////////////////////////////////////////////////////////////////////// /// Template specializations for C++ std::array and C-style arrays //////////////////////////////////////////////////////////////////////////////// @@ -81,7 +78,7 @@ public: size_t GetLength() const { return fArrayLength; } size_t GetValueSize() const final { return fItemSize * fArrayLength; } size_t GetAlignment() const final { return fSubfields[0]->GetAlignment(); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; template @@ -158,7 +155,7 @@ public: std::vector SplitValue(const RValue &value) const final; size_t GetValueSize() const final; size_t GetAlignment() const final; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; void GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const { @@ -242,7 +239,7 @@ public: std::vector SplitValue(const RValue &value) const final; size_t GetValueSize() const final { return sizeof(std::vector); } size_t GetAlignment() const final { return std::alignment_of>(); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; void GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const { @@ -300,7 +297,7 @@ public: size_t GetValueSize() const final { return sizeof(std::vector); } size_t GetAlignment() const final { return std::alignment_of>(); } - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; void GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const { @@ -361,7 +358,7 @@ public: std::size_t GetAlignment() const final; std::vector SplitValue(const RFieldBase::RValue &value) const final; - void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const final; + void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final; }; namespace Experimental { diff --git a/tree/ntuple/v7/inc/ROOT/RFieldBase.hxx b/tree/ntuple/v7/inc/ROOT/RFieldBase.hxx index a922c2694f070..62f19e4f8f660 100644 --- a/tree/ntuple/v7/inc/ROOT/RFieldBase.hxx +++ b/tree/ntuple/v7/inc/ROOT/RFieldBase.hxx @@ -35,6 +35,10 @@ namespace ROOT { class RFieldBase; class RClassField; +namespace Detail { +class RFieldVisitor; +} // namespace Detail + namespace Experimental { class RNTupleJoinProcessor; @@ -44,10 +48,6 @@ class RPageSink; class RPageSource; } // namespace Internal -namespace Detail { -class RFieldVisitor; -} // namespace Detail - } // namespace Experimental namespace Internal { @@ -619,7 +619,7 @@ public: RConstSchemaIterator cbegin() const; RConstSchemaIterator cend() const; - virtual void AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const; + virtual void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const; }; // class RFieldBase /// Iterates over the sub tree of fields in depth-first search order diff --git a/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx b/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx index 9c29be16fe013..020ed4cb6b9b2 100644 --- a/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx +++ b/tree/ntuple/v7/inc/ROOT/RFieldVisitor.hxx @@ -26,13 +26,11 @@ #include namespace ROOT { -namespace Experimental { namespace Detail { - // clang-format off /** -\class ROOT::Experimental::Detail::RFieldVisitor +\class ROOT::Detail::RFieldVisitor \ingroup NTuple \brief Abstract base class for classes implementing the visitor design pattern. @@ -79,10 +77,11 @@ public: } // namespace Detail +namespace Internal { // clang-format off /** -\class ROOT::Experimental::RPrepareVisitor +\class ROOT::Internal::RPrepareVisitor \ingroup NTuple \brief Visitor used for a pre-processing run to collect information needed by another visitor class. @@ -103,10 +102,9 @@ public: unsigned int GetNumFields() const { return fNumFields; } }; - // clang-format off /** -\class ROOT::Experimental::RPrintSchemaVisitor +\class ROOT::Internal::RPrintSchemaVisitor \ingroup NTuple \brief Contains settings for printing and prints a summary of an RField instance. @@ -165,10 +163,9 @@ public: } }; - // clang-format off /** -\class ROOT::Experimental::RPrintValueVisitor +\class ROOT::Internal::RPrintValueVisitor \ingroup NTuple \brief Renders a JSON value corresponding to the field. */ @@ -235,10 +232,9 @@ public: void VisitAtomicField(const ROOT::RAtomicField &field) final; }; - // clang-format off /** -\class ROOT::Experimental::RNTupleFormatter +\class ROOT::Internal::RNTupleFormatter \ingroup NTuple \brief Contains helper functions for RNTupleReader::PrintInfo() and RPrintSchemaVisitor::VisitField() @@ -251,7 +247,7 @@ public: static std::string FitString(const std::string &str, int availableSpace); }; -} // namespace Experimental +} // namespace Internal } // namespace ROOT #endif diff --git a/tree/ntuple/v7/src/RField.cxx b/tree/ntuple/v7/src/RField.cxx index a0417291aaa1e..601e76578be14 100644 --- a/tree/ntuple/v7/src/RField.cxx +++ b/tree/ntuple/v7/src/RField.cxx @@ -39,7 +39,7 @@ std::unique_ptr ROOT::RFieldZero::CloneImpl(std::string_view / return result; } -void ROOT::RFieldZero::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RFieldZero::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitFieldZero(*this); } @@ -61,7 +61,7 @@ void ROOT::RCardinalityField::GenerateColumns(const ROOT::Experimental::RNTupleD GenerateColumnsImpl(desc); } -void ROOT::RCardinalityField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RCardinalityField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitCardinalityField(*this); } @@ -100,7 +100,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RField::GetColumnRep return representations; } -void ROOT::RField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitCharField(*this); } @@ -115,7 +115,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RField::GetColu return representations; } -void ROOT::RField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitByteField(*this); } @@ -144,7 +144,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitInt8Field(*this); } @@ -173,7 +173,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitUInt8Field(*this); } @@ -202,7 +202,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RField::GetColumnRep return representations; } -void ROOT::RField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitBoolField(*this); } @@ -222,7 +222,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RField::GetColumnRe return representations; } -void ROOT::RField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitFloatField(*this); } @@ -244,7 +244,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RField::GetColumnR return representations; } -void ROOT::RField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitDoubleField(*this); } @@ -278,7 +278,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitInt16Field(*this); } @@ -307,7 +307,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitUInt16Field(*this); } @@ -336,7 +336,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitInt32Field(*this); } @@ -365,7 +365,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitUInt32Field(*this); } @@ -394,7 +394,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitUInt64Field(*this); } @@ -423,7 +423,7 @@ const ROOT::RFieldBase::RColumnRepresentations &ROOT::RIntegralField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RIntegralField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitInt64Field(*this); } @@ -474,7 +474,7 @@ void ROOT::RField::ReadGlobalImpl(ROOT::NTupleSize_t globalIndex, v } } -void ROOT::RField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitStringField(*this); } @@ -617,7 +617,7 @@ std::vector ROOT::RRecordField::SplitValue(const RValu return result; } -void ROOT::RRecordField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RRecordField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitRecordField(*this); } @@ -687,7 +687,7 @@ void ROOT::RBitsetField::ReadInClusterImpl(RNTupleLocalIndex localIndex, void *t } } -void ROOT::RBitsetField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RBitsetField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitBitsetField(*this); } @@ -743,7 +743,7 @@ ROOT::RNTupleLocalIndex ROOT::RNullableField::GetItemIndex(ROOT::NTupleSize_t gl return (collectionSize == 0) ? RNTupleLocalIndex() : collectionStart; } -void ROOT::RNullableField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RNullableField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitNullableField(*this); } @@ -954,7 +954,7 @@ std::vector ROOT::RAtomicField::SplitValue(const RValu return result; } -void ROOT::RAtomicField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RAtomicField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitAtomicField(*this); } diff --git a/tree/ntuple/v7/src/RFieldBase.cxx b/tree/ntuple/v7/src/RFieldBase.cxx index 127cd0f071f4a..f9f739d73d52a 100644 --- a/tree/ntuple/v7/src/RFieldBase.cxx +++ b/tree/ntuple/v7/src/RFieldBase.cxx @@ -1024,7 +1024,7 @@ void ROOT::RFieldBase::ConnectPageSource(ROOT::Experimental::Internal::RPageSour fState = EState::kConnectedToSource; } -void ROOT::RFieldBase::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RFieldBase::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitField(*this); } diff --git a/tree/ntuple/v7/src/RFieldMeta.cxx b/tree/ntuple/v7/src/RFieldMeta.cxx index 18a6b4ab40f35..8ed2088aa151d 100644 --- a/tree/ntuple/v7/src/RFieldMeta.cxx +++ b/tree/ntuple/v7/src/RFieldMeta.cxx @@ -480,7 +480,7 @@ std::uint32_t ROOT::RClassField::GetTypeChecksum() const return fClass->GetCheckSum(); } -void ROOT::RClassField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RClassField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitClassField(*this); } @@ -539,7 +539,7 @@ std::vector ROOT::REnumField::SplitValue(const RValue return result; } -void ROOT::REnumField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::REnumField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitEnumField(*this); } @@ -762,7 +762,7 @@ std::vector ROOT::RProxiedCollectionField::SplitValue( return result; } -void ROOT::RProxiedCollectionField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RProxiedCollectionField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitProxiedCollectionField(*this); } @@ -919,7 +919,7 @@ std::uint32_t ROOT::RStreamerField::GetTypeChecksum() const return fClass->GetCheckSum(); } -void ROOT::RStreamerField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RStreamerField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitStreamerField(*this); } @@ -1037,7 +1037,7 @@ size_t ROOT::RField::GetAlignment() const return alignof(TObject); } -void ROOT::RField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitTObjectField(*this); } diff --git a/tree/ntuple/v7/src/RFieldSequenceContainer.cxx b/tree/ntuple/v7/src/RFieldSequenceContainer.cxx index f9261e7e5f184..f41a789a582a5 100644 --- a/tree/ntuple/v7/src/RFieldSequenceContainer.cxx +++ b/tree/ntuple/v7/src/RFieldSequenceContainer.cxx @@ -116,7 +116,7 @@ std::vector ROOT::RArrayField::SplitValue(const RValue return result; } -void ROOT::RArrayField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RArrayField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitArrayField(*this); } @@ -464,7 +464,7 @@ size_t ROOT::RRVecField::GetAlignment() const return EvalRVecAlignment(fSubfields[0]->GetAlignment()); } -void ROOT::RRVecField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RRVecField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitRVecField(*this); } @@ -620,7 +620,7 @@ std::vector ROOT::RVectorField::SplitValue(const RValu return result; } -void ROOT::RVectorField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RVectorField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitVectorField(*this); } @@ -697,7 +697,7 @@ std::vector ROOT::RField>::SplitValu return result; } -void ROOT::RField>::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RField>::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitVectorBoolField(*this); } @@ -838,7 +838,7 @@ std::vector ROOT::RArrayAsRVecField::SplitValue(const return result; } -void ROOT::RArrayAsRVecField::AcceptVisitor(ROOT::Experimental::Detail::RFieldVisitor &visitor) const +void ROOT::RArrayAsRVecField::AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const { visitor.VisitArrayAsRVecField(*this); } diff --git a/tree/ntuple/v7/src/RFieldVisitor.cxx b/tree/ntuple/v7/src/RFieldVisitor.cxx index 59963c5d7c3f1..5a54407d88ed2 100644 --- a/tree/ntuple/v7/src/RFieldVisitor.cxx +++ b/tree/ntuple/v7/src/RFieldVisitor.cxx @@ -28,7 +28,7 @@ //----------------------------- RPrepareVisitor -------------------------------- -void ROOT::Experimental::RPrepareVisitor::VisitField(const ROOT::RFieldBase &field) +void ROOT::Internal::RPrepareVisitor::VisitField(const ROOT::RFieldBase &field) { auto subfields = field.GetConstSubfields(); for (auto f : subfields) { @@ -39,7 +39,7 @@ void ROOT::Experimental::RPrepareVisitor::VisitField(const ROOT::RFieldBase &fie } } -void ROOT::Experimental::RPrepareVisitor::VisitFieldZero(const ROOT::RFieldZero &field) +void ROOT::Internal::RPrepareVisitor::VisitFieldZero(const ROOT::RFieldZero &field) { VisitField(field); fNumFields--; @@ -49,19 +49,18 @@ void ROOT::Experimental::RPrepareVisitor::VisitFieldZero(const ROOT::RFieldZero //---------------------------- RPrintSchemaVisitor ----------------------------- - -void ROOT::Experimental::RPrintSchemaVisitor::SetDeepestLevel(int d) +void ROOT::Internal::RPrintSchemaVisitor::SetDeepestLevel(int d) { fDeepestLevel = d; } -void ROOT::Experimental::RPrintSchemaVisitor::SetNumFields(int n) +void ROOT::Internal::RPrintSchemaVisitor::SetNumFields(int n) { fNumFields = n; SetAvailableSpaceForStrings(); } -void ROOT::Experimental::RPrintSchemaVisitor::VisitField(const ROOT::RFieldBase &field) +void ROOT::Internal::RPrintSchemaVisitor::VisitField(const ROOT::RFieldBase &field) { fOutput << fFrameSymbol << ' '; @@ -91,7 +90,7 @@ void ROOT::Experimental::RPrintSchemaVisitor::VisitField(const ROOT::RFieldBase } } -void ROOT::Experimental::RPrintSchemaVisitor::VisitFieldZero(const ROOT::RFieldZero &fieldZero) +void ROOT::Internal::RPrintSchemaVisitor::VisitFieldZero(const ROOT::RFieldZero &fieldZero) { auto fieldNo = 1; for (auto f : fieldZero.GetConstSubfields()) { @@ -104,7 +103,7 @@ void ROOT::Experimental::RPrintSchemaVisitor::VisitFieldZero(const ROOT::RFieldZ //--------------------------- RPrintValueVisitor ------------------------------- -void ROOT::Experimental::RPrintValueVisitor::PrintIndent() +void ROOT::Internal::RPrintValueVisitor::PrintIndent() { if (fPrintOptions.fPrintSingleLine) return; @@ -113,13 +112,13 @@ void ROOT::Experimental::RPrintValueVisitor::PrintIndent() fOutput << " "; } -void ROOT::Experimental::RPrintValueVisitor::PrintName(const ROOT::RFieldBase &field) +void ROOT::Internal::RPrintValueVisitor::PrintName(const ROOT::RFieldBase &field) { if (fPrintOptions.fPrintName) fOutput << "\"" << field.GetFieldName() << "\": "; } -void ROOT::Experimental::RPrintValueVisitor::PrintCollection(const ROOT::RFieldBase &field) +void ROOT::Internal::RPrintValueVisitor::PrintCollection(const ROOT::RFieldBase &field) { PrintIndent(); PrintName(field); @@ -140,7 +139,7 @@ void ROOT::Experimental::RPrintValueVisitor::PrintCollection(const ROOT::RFieldB fOutput << "]"; } -void ROOT::Experimental::RPrintValueVisitor::PrintRecord(const ROOT::RFieldBase &field) +void ROOT::Internal::RPrintValueVisitor::PrintRecord(const ROOT::RFieldBase &field) { PrintIndent(); PrintName(field); @@ -169,14 +168,14 @@ void ROOT::Experimental::RPrintValueVisitor::PrintRecord(const ROOT::RFieldBase fOutput << "}"; } -void ROOT::Experimental::RPrintValueVisitor::VisitField(const ROOT::RFieldBase &field) +void ROOT::Internal::RPrintValueVisitor::VisitField(const ROOT::RFieldBase &field) { PrintIndent(); PrintName(field); fOutput << "\"\""; } -void ROOT::Experimental::RPrintValueVisitor::VisitBoolField(const ROOT::RField &field) +void ROOT::Internal::RPrintValueVisitor::VisitBoolField(const ROOT::RField &field) { PrintIndent(); PrintName(field); @@ -186,21 +185,21 @@ void ROOT::Experimental::RPrintValueVisitor::VisitBoolField(const ROOT::RField &field) +void ROOT::Internal::RPrintValueVisitor::VisitDoubleField(const ROOT::RField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitFloatField(const ROOT::RField &field) +void ROOT::Internal::RPrintValueVisitor::VisitFloatField(const ROOT::RField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitByteField(const ROOT::RField &field) +void ROOT::Internal::RPrintValueVisitor::VisitByteField(const ROOT::RField &field) { PrintIndent(); PrintName(field); @@ -210,42 +209,42 @@ void ROOT::Experimental::RPrintValueVisitor::VisitByteField(const ROOT::RField &field) +void ROOT::Internal::RPrintValueVisitor::VisitCharField(const ROOT::RField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitInt8Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitInt8Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << static_cast(fValue.GetRef()); } -void ROOT::Experimental::RPrintValueVisitor::VisitInt16Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitInt16Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitInt32Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitInt32Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitInt64Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitInt64Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitStringField(const ROOT::RField &field) +void ROOT::Internal::RPrintValueVisitor::VisitStringField(const ROOT::RField &field) { PrintIndent(); PrintName(field); @@ -253,35 +252,35 @@ void ROOT::Experimental::RPrintValueVisitor::VisitStringField(const ROOT::RField fOutput << "\"" << fValue.GetRef() << "\""; } -void ROOT::Experimental::RPrintValueVisitor::VisitUInt8Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitUInt8Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << static_cast(fValue.GetRef()); } -void ROOT::Experimental::RPrintValueVisitor::VisitUInt16Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitUInt16Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitUInt32Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitUInt32Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitUInt64Field(const ROOT::RIntegralField &field) +void ROOT::Internal::RPrintValueVisitor::VisitUInt64Field(const ROOT::RIntegralField &field) { PrintIndent(); PrintName(field); fOutput << fValue.GetRef(); } -void ROOT::Experimental::RPrintValueVisitor::VisitCardinalityField(const ROOT::RCardinalityField &field) +void ROOT::Internal::RPrintValueVisitor::VisitCardinalityField(const ROOT::RCardinalityField &field) { PrintIndent(); PrintName(field); @@ -296,7 +295,7 @@ void ROOT::Experimental::RPrintValueVisitor::VisitCardinalityField(const ROOT::R R__ASSERT(false && "unsupported cardinality size type"); } -void ROOT::Experimental::RPrintValueVisitor::VisitBitsetField(const ROOT::RBitsetField &field) +void ROOT::Internal::RPrintValueVisitor::VisitBitsetField(const ROOT::RBitsetField &field) { constexpr auto nBitsULong = sizeof(unsigned long) * 8; const auto *asULongArray = fValue.GetPtr().get(); @@ -315,39 +314,39 @@ void ROOT::Experimental::RPrintValueVisitor::VisitBitsetField(const ROOT::RBitse fOutput << str << "\""; } -void ROOT::Experimental::RPrintValueVisitor::VisitArrayField(const ROOT::RArrayField &field) +void ROOT::Internal::RPrintValueVisitor::VisitArrayField(const ROOT::RArrayField &field) { PrintCollection(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitArrayAsRVecField(const ROOT::RArrayAsRVecField &field) +void ROOT::Internal::RPrintValueVisitor::VisitArrayAsRVecField(const ROOT::RArrayAsRVecField &field) { PrintCollection(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitStreamerField(const ROOT::RStreamerField &field) +void ROOT::Internal::RPrintValueVisitor::VisitStreamerField(const ROOT::RStreamerField &field) { PrintIndent(); PrintName(field); fOutput << ""; } -void ROOT::Experimental::RPrintValueVisitor::VisitClassField(const ROOT::RClassField &field) +void ROOT::Internal::RPrintValueVisitor::VisitClassField(const ROOT::RClassField &field) { PrintRecord(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitTObjectField(const ROOT::RField &field) +void ROOT::Internal::RPrintValueVisitor::VisitTObjectField(const ROOT::RField &field) { PrintRecord(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitRecordField(const ROOT::RRecordField &field) +void ROOT::Internal::RPrintValueVisitor::VisitRecordField(const ROOT::RRecordField &field) { PrintRecord(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitNullableField(const ROOT::RNullableField &field) +void ROOT::Internal::RPrintValueVisitor::VisitNullableField(const ROOT::RNullableField &field) { PrintIndent(); PrintName(field); @@ -363,7 +362,7 @@ void ROOT::Experimental::RPrintValueVisitor::VisitNullableField(const ROOT::RNul } } -void ROOT::Experimental::RPrintValueVisitor::VisitEnumField(const ROOT::REnumField &field) +void ROOT::Internal::RPrintValueVisitor::VisitEnumField(const ROOT::REnumField &field) { PrintIndent(); PrintName(field); @@ -375,7 +374,7 @@ void ROOT::Experimental::RPrintValueVisitor::VisitEnumField(const ROOT::REnumFie intValue.GetField().AcceptVisitor(visitor); } -void ROOT::Experimental::RPrintValueVisitor::VisitAtomicField(const ROOT::RAtomicField &field) +void ROOT::Internal::RPrintValueVisitor::VisitAtomicField(const ROOT::RAtomicField &field) { PrintIndent(); PrintName(field); @@ -387,30 +386,29 @@ void ROOT::Experimental::RPrintValueVisitor::VisitAtomicField(const ROOT::RAtomi itemValue.GetField().AcceptVisitor(visitor); } -void ROOT::Experimental::RPrintValueVisitor::VisitProxiedCollectionField(const ROOT::RProxiedCollectionField &field) +void ROOT::Internal::RPrintValueVisitor::VisitProxiedCollectionField(const ROOT::RProxiedCollectionField &field) { PrintCollection(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitVectorField(const ROOT::RVectorField &field) +void ROOT::Internal::RPrintValueVisitor::VisitVectorField(const ROOT::RVectorField &field) { PrintCollection(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitVectorBoolField(const ROOT::RField> &field) +void ROOT::Internal::RPrintValueVisitor::VisitVectorBoolField(const ROOT::RField> &field) { PrintCollection(field); } -void ROOT::Experimental::RPrintValueVisitor::VisitRVecField(const ROOT::RRVecField &field) +void ROOT::Internal::RPrintValueVisitor::VisitRVecField(const ROOT::RRVecField &field) { PrintCollection(field); } //---------------------------- RNTupleFormatter -------------------------------- - -std::string ROOT::Experimental::RNTupleFormatter::FitString(const std::string &str, int availableSpace) +std::string ROOT::Internal::RNTupleFormatter::FitString(const std::string &str, int availableSpace) { int strSize{static_cast(str.size())}; if (strSize <= availableSpace) diff --git a/tree/ntuple/v7/src/RNTupleReader.cxx b/tree/ntuple/v7/src/RNTupleReader.cxx index 6574b6a700be7..a77eb958b1677 100644 --- a/tree/ntuple/v7/src/RNTupleReader.cxx +++ b/tree/ntuple/v7/src/RNTupleReader.cxx @@ -150,6 +150,8 @@ std::unique_ptr ROOT::Experimental::RNTupleReader::C void ROOT::Experimental::RNTupleReader::PrintInfo(const ENTupleInfo what, std::ostream &output) const { + using namespace ROOT::Internal; + // TODO(lesimon): In a later version, these variables may be defined by the user or the ideal width may be read out // from the terminal. char frameSymbol = '*'; @@ -233,7 +235,7 @@ void ROOT::Experimental::RNTupleReader::Show(ROOT::NTupleSize_t index, std::ostr output << "{"; for (auto iValue = entry.begin(); iValue != entry.end();) { output << std::endl; - RPrintValueVisitor visitor(*iValue, output, 1 /* level */); + ROOT::Internal::RPrintValueVisitor visitor(*iValue, output, 1 /* level */); iValue->GetField().AcceptVisitor(visitor); if (++iValue == entry.end()) { diff --git a/tree/ntuple/v7/test/ntuple_test.hxx b/tree/ntuple/v7/test/ntuple_test.hxx index c489dcaa9f3df..0745b94b53935 100644 --- a/tree/ntuple/v7/test/ntuple_test.hxx +++ b/tree/ntuple/v7/test/ntuple_test.hxx @@ -106,8 +106,8 @@ using RPageSinkFile = ROOT::Experimental::Internal::RPageSinkFile; using RPageSource = ROOT::Experimental::Internal::RPageSource; using RPageSourceFile = ROOT::Experimental::Internal::RPageSourceFile; using RPageStorage = ROOT::Experimental::Internal::RPageStorage; -using RPrepareVisitor = ROOT::Experimental::RPrepareVisitor; -using RPrintSchemaVisitor = ROOT::Experimental::RPrintSchemaVisitor; +using RPrepareVisitor = ROOT::Internal::RPrepareVisitor; +using RPrintSchemaVisitor = ROOT::Internal::RPrintSchemaVisitor; using RRawFile = ROOT::Internal::RRawFile; using EContainerFormat = RNTupleFileWriter::EContainerFormat; template