Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/cont/inc/TList.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ class TListIter;
class TList : public TSeqCollection {

friend class TListIter;

protected:
public:
using TObjLinkPtr_t = std::shared_ptr<TObjLink>;
protected:
using TObjLinkWeakPtr_t = std::weak_ptr<TObjLink>;

TObjLinkPtr_t fFirst; //! pointer to first entry in linked list
Expand Down Expand Up @@ -121,9 +121,9 @@ friend class TListIter;
class TObjLink : public std::enable_shared_from_this<TObjLink> {

friend class TList;

private:
public:
using TObjLinkPtr_t = std::shared_ptr<TObjLink>;
private:
using TObjLinkWeakPtr_t = std::weak_ptr<TObjLink>;

TObjLinkPtr_t fNext;
Expand Down
41 changes: 18 additions & 23 deletions core/meta/inc/TFileMergeInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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; } ;
Expand Down
9 changes: 7 additions & 2 deletions core/rint/test/TTabComTests.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions geom/geom/inc/TGeoTessellated.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "TGeoBBox.h"

class TGeoFacet {
public:
using Vertex_t = Tessellated::Vertex_t;
using VertexVec_t = Tessellated::VertexVec_t;

Expand Down
1 change: 1 addition & 0 deletions tree/tree/inc/TBranch.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class TBulkBranchRead {
}

class TBranch : public TNamed, public TAttFill {
public:
using TIOFeatures = ROOT::TIOFeatures;

protected:
Expand Down
5 changes: 4 additions & 1 deletion tree/tree/inc/TLeaf.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,12 @@ class TLeaf : public TNamed {

virtual Int_t GetOffsetHeaderSize() const {return 0;}

protected:
public:

using Counts_t = std::vector<Int_t>;

protected:

struct LeafCountValues {
Counts_t fValues;
Long64_t fStartEntry{-1}; ///<! entry number of corresponding to element 0 of the vector.
Expand Down
Loading