Skip to content

TTree::GetEntry() entry parameter default value fix #8425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcanal merged 6 commits into from
Jun 21, 2021
Merged

TTree::GetEntry() entry parameter default value fix #8425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c14c5e7
TTree::GetEntry() fix
AdvaitDhingra Jun 14, 2021
795cc8d
Merge branch 'root-project:master' into TTreeGetEntryFix
AdvaitDhingra Jun 14, 2021
5342e9c
Removed accidental indent
AdvaitDhingra Jun 14, 2021
cdd3c3e
Changed Warning to Error
AdvaitDhingra Jun 14, 2021
1a25b8b
Removed entry conditional statement and it's warning
AdvaitDhingra Jun 16, 2021
bf1aeb5
Update tree/tree/inc/TTree.h
AdvaitDhingra Jun 16, 2021
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
4 changes: 2 additions & 2 deletions tree/tree/inc/TTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,8 @@ class TTree : public TNamed, public TAttLine, public TAttFill, public TAttMarker
virtual Long64_t GetEntriesFast() const { return fEntries; }
virtual Long64_t GetEntriesFriend() const;
virtual Long64_t GetEstimate() const { return fEstimate; }
virtual Int_t GetEntry(Long64_t entry = 0, Int_t getall = 0);
Int_t GetEvent(Long64_t entry = 0, Int_t getall = 0) { return GetEntry(entry, getall); }
virtual Int_t GetEntry(Long64_t entry, Int_t getall = 0);
Int_t GetEvent(Long64_t entry, Int_t getall = 0) { return GetEntry(entry, getall); }
virtual Int_t GetEntryWithIndex(Int_t major, Int_t minor = 0);
virtual Long64_t GetEntryNumberWithBestIndex(Long64_t major, Long64_t minor = 0) const;
virtual Long64_t GetEntryNumberWithIndex(Long64_t major, Long64_t minor = 0) const;
Expand Down
1 change: 0 additions & 1 deletion tree/tree/src/TTree.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5581,7 +5581,6 @@ Long64_t TTree::GetEntriesFriend() const

Int_t TTree::GetEntry(Long64_t entry, Int_t getall)
{

// We already have been visited while recursively looking
// through the friends tree, let return
if (kGetEntry & fFriendLockStatus) return 0;
Expand Down