From 6fb113e113faeff79a16c23b477e581744e3ec7f Mon Sep 17 00:00:00 2001 From: Rene Brun <Rene.Brun@cern.ch> Date: Thu, 24 Apr 2008 14:19:59 +0000 Subject: [PATCH] Fix shadowed variables git-svn-id: http://root.cern.ch/svn/root/trunk@23516 27541ba8-7e3a-0410-8455-c3a389f83636 --- misc/table/inc/TTable.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misc/table/inc/TTable.h b/misc/table/inc/TTable.h index f7f833252ba..6e64fbbfae8 100644 --- a/misc/table/inc/TTable.h +++ b/misc/table/inc/TTable.h @@ -190,12 +190,13 @@ public: vec_iterator fCurrentRow; public: iterator(): fRowSize(0), fThisTable(0) {;} - iterator(const TTable &table, vec_iterator &rowPtr) : fRowSize(table.GetRowSize()), fThisTable(&table), fCurrentRow(rowPtr) {;} - iterator(const TTable &table, vec_const_iterator &rowPtr) : + iterator(const TTable &table, vec_iterator &arowPtr) : + fRowSize(table.GetRowSize()), fThisTable(&table), fCurrentRow(arowPtr) {;} + iterator(const TTable &table, vec_const_iterator &arowPtr) : fRowSize(table.GetRowSize()), fThisTable(&table), - fCurrentRow(*(std::vector<Long_t>::iterator *)(void *)&rowPtr) {;} -// fCurrentRow(* const_cast<vector<Long_t>::iterator *>(&rowPtr) ) {;} + fCurrentRow(*(std::vector<Long_t>::iterator *)(void *)&arowPtr) {;} +// fCurrentRow(* const_cast<vector<Long_t>::iterator *>(&arowPtr) ) {;} iterator(const iterator& iter) : fRowSize (iter.fRowSize), fThisTable(iter.fThisTable),fCurrentRow(iter.fCurrentRow){} void operator=(const iterator& iter) { fRowSize = iter.fRowSize; fThisTable = iter.fThisTable; fCurrentRow=iter.fCurrentRow; } void operator++() { ++fCurrentRow; } -- GitLab