Skip to content
Draft
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
4 changes: 2 additions & 2 deletions core/meta/inc/TFileMergeInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ class TIOFeatures;
}

class TFileMergeInfo {
private:
public:
using TIOFeatures = ROOT::TIOFeatures;

private:
TFileMergeInfo() = delete;
TFileMergeInfo(const TFileMergeInfo&) = delete;
TFileMergeInfo& operator=(const TFileMergeInfo&) = delete;
Expand Down
4 changes: 2 additions & 2 deletions core/rint/test/TTabComTests.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ TEST(TTabComTests, CompleteTProfile)

TEST(TTabComTests, CompleteTObj)
{
std::string expected = "TObjArray TObjArrayIter TObjLink TObjOptLink TObjString"
" TObject TObjectRefSpy TObjectSpy TObjectTable";
std::string expected = "TObjArray TObjArrayIter TObjLink TObjLinkPtr_t TObjOptLink"
" TObjString TObject TObjectRefSpy TObjectSpy TObjectTable";
// 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