diff --git a/core/cont/inc/TList.h b/core/cont/inc/TList.h index a86af707c175c..267a3a7acb58b 100644 --- a/core/cont/inc/TList.h +++ b/core/cont/inc/TList.h @@ -38,9 +38,9 @@ class TListIter; class TList : public TSeqCollection { friend class TListIter; - -protected: +public: using TObjLinkPtr_t = std::shared_ptr; +protected: using TObjLinkWeakPtr_t = std::weak_ptr; TObjLinkPtr_t fFirst; //! pointer to first entry in linked list @@ -121,9 +121,9 @@ friend class TListIter; class TObjLink : public std::enable_shared_from_this { friend class TList; - -private: +public: using TObjLinkPtr_t = std::shared_ptr; +private: using TObjLinkWeakPtr_t = std::weak_ptr; TObjLinkPtr_t fNext; diff --git a/core/meta/inc/TFileMergeInfo.h b/core/meta/inc/TFileMergeInfo.h index 5404fc8d1b6d0..603ccdb6a19ce 100644 --- a/core/meta/inc/TFileMergeInfo.h +++ b/core/meta/inc/TFileMergeInfo.h @@ -8,25 +8,20 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ +/** \class TFileMergeInfo +A class to pass information from the TFileMerger to the objects being merged. +*/ + #ifndef ROOT_TFileMergeInfo #define ROOT_TFileMergeInfo -////////////////////////////////////////////////////////////////////////// -// // -// TFileMergeInfo // -// // -// This class helps passing information from the TFileMerger to // -// the objects being merged. // -// // -// It provides access to the output directory pointer (fOutputDirectory)// -// to whether or not this is the first time Merge is being called in the// -// serie (for example for TTree, the first time we also need to Clone // -// the object on which Merge is called), and provides for a User Data // -// object to be passed along to each of the calls to Merge. // -// The fUserData object is owned by the TFileMergeInfo and will be // -// deleted when the TFileMerger moves on to the next set of objects. // -// // -////////////////////////////////////////////////////////////////////////// +/// This class provides access to the output directory pointer (fOutputDirectory) +/// whether or not this is the first time Merge is being called in the +/// series (for example for TTree, the first time we also need to Clone +/// the object on which Merge is called), and provides for a User Data +/// object to be passed along to each of the calls to Merge. +/// The fUserData object is owned by the TFileMergeInfo and will be +/// deleted when the TFileMerger moves on to the next set of objects. #include "TObject.h" @@ -39,19 +34,19 @@ class TIOFeatures; } class TFileMergeInfo { -private: +public: using TIOFeatures = ROOT::TIOFeatures; - +private: TFileMergeInfo() = delete; TFileMergeInfo(const TFileMergeInfo&) = delete; TFileMergeInfo& operator=(const TFileMergeInfo&) = delete; public: - TDirectory *fOutputDirectory{nullptr}; // Target directory where the merged object will be written. - Bool_t fIsFirst{kTRUE}; // True if this is the first call to Merge for this series of object. - TString fOptions; // Additional text based option being passed down to customize the merge. - TObject *fUserData{nullptr}; // Place holder to pass extra information. This object will be deleted at the end of each series of objects. - TIOFeatures *fIOFeatures{nullptr}; // Any ROOT IO features that should be explicitly enabled. + TDirectory *fOutputDirectory{nullptr}; ///< Target directory where the merged object will be written. + Bool_t fIsFirst{kTRUE}; ///< True if this is the first call to Merge for this series of object. + TString fOptions; ///< Additional text based option being passed down to customize the merge. + TObject *fUserData{nullptr}; ///< Place holder to pass extra information. This object will be deleted at the end of each series of objects. + TIOFeatures *fIOFeatures{nullptr}; ///< Any ROOT IO features that should be explicitly enabled. TFileMergeInfo(TDirectory *outputfile) : fOutputDirectory(outputfile) {} virtual ~TFileMergeInfo() { delete fUserData; } ; diff --git a/core/rint/test/TTabComTests.cxx b/core/rint/test/TTabComTests.cxx index 2557cfb316665..bd945995a3813 100644 --- a/core/rint/test/TTabComTests.cxx +++ b/core/rint/test/TTabComTests.cxx @@ -95,8 +95,13 @@ TEST(TTabComTests, CompleteTProfile) TEST(TTabComTests, CompleteTObj) { - std::string expected = "TObjArray TObjArrayIter TObjLink TObjOptLink TObjString" - " TObject TObjectRefSpy TObjectSpy TObjectTable"; + #ifdef R__USE_CXXMODULES + std::string expected = "TObjArray TObjArrayIter TObjLink TObjLinkPtr_t TObjOptLink" + " TObjString TObject TObjectRefSpy TObjectSpy TObjectTable"; + #else + std::string expected = "TObjArray TObjArrayIter TObjLink TObjOptLink" + " TObjString TObject TObjectRefSpy TObjectSpy TObjectTable"; + #endif // FIXME: See ROOT-10989 ASSERT_STREQ(expected.c_str(), GetCompletions("TObj", /*ignore=*/{"TObjectDisplayItem", "TObjectDrawable", "TObjectHolder", diff --git a/geom/geom/inc/TGeoTessellated.h b/geom/geom/inc/TGeoTessellated.h index 062b613d1c2f9..be7cb08b08f5d 100644 --- a/geom/geom/inc/TGeoTessellated.h +++ b/geom/geom/inc/TGeoTessellated.h @@ -18,6 +18,7 @@ #include "TGeoBBox.h" class TGeoFacet { +public: using Vertex_t = Tessellated::Vertex_t; using VertexVec_t = Tessellated::VertexVec_t; diff --git a/tree/tree/inc/TBranch.h b/tree/tree/inc/TBranch.h index a74cd85c01d15..e88a6cf596e1a 100644 --- a/tree/tree/inc/TBranch.h +++ b/tree/tree/inc/TBranch.h @@ -91,6 +91,7 @@ class TBulkBranchRead { } class TBranch : public TNamed, public TAttFill { +public: using TIOFeatures = ROOT::TIOFeatures; protected: diff --git a/tree/tree/inc/TLeaf.h b/tree/tree/inc/TLeaf.h index bdfa83038cb39..00692d43a8a46 100644 --- a/tree/tree/inc/TLeaf.h +++ b/tree/tree/inc/TLeaf.h @@ -60,9 +60,12 @@ class TLeaf : public TNamed { virtual Int_t GetOffsetHeaderSize() const {return 0;} -protected: +public: using Counts_t = std::vector; + +protected: + struct LeafCountValues { Counts_t fValues; Long64_t fStartEntry{-1}; ///