Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / MUON / AliMUONClusterStoreV2Iterator.cxx

diff --git a/MUON/AliMUONClusterStoreV2Iterator.cxx b/MUON/AliMUONClusterStoreV2Iterator.cxx
index 379b11cf1b75ebdadfef1186fabe5d598e0611e4..884b753ce289758a579b28ff131ce39e48a01b6d 100644 (file)
--- a/MUON/AliMUONClusterStoreV2Iterator.cxx
+++ b/MUON/AliMUONClusterStoreV2Iterator.cxx
@@ -40,7 +40,7 @@ ClassImp(AliMUONClusterStoreV2Iterator)
 AliMUONClusterStoreV2Iterator::AliMUONClusterStoreV2Iterator(const AliMUONClusterStoreV2* store,
                                                              Int_t firstChamberId, Int_t lastChamberId)
 : TIterator(),
-  fStore(store),
+  fkStore(store),
   fFirstChamberId(firstChamberId),
   fLastChamberId(lastChamberId),
   fCurrentChamberId(-1),
@@ -55,14 +55,11 @@ AliMUONClusterStoreV2Iterator::AliMUONClusterStoreV2Iterator(const AliMUONCluste
 }
 
 //_____________________________________________________________________________
-TIterator& AliMUONClusterStoreV2Iterator::operator=(const TIterator& /*iter*/)
+AliMUONClusterStoreV2Iterator& 
+AliMUONClusterStoreV2Iterator::operator=(const TIterator& /*iter*/)
 {
-  /// Overriden operator= (imposed by Root's definition of TIterator::operator= ?)
-/*
-  if ( this != &iter && iter.IsA() == AliMUONClusterStoreV2Iterator::Class() ) {
-    (*this) = static_cast<const AliMUONClusterStoreV2Iterator&>(iter);
-  }
-*/
+  // Overriden operator= (imposed by Root's definition of TIterator::operator= ?)
+
   AliFatalGeneral("AliMUONClusterStoreV2Iterator::operator=","reimplement me");
   return *this;
 }
@@ -94,7 +91,7 @@ TObject* AliMUONClusterStoreV2Iterator::Next()
     
     fCurrentChamberId++;
     delete fChamberIterator;
-    fChamberIterator = static_cast<AliMpExMap*>(fStore->fMap->UncheckedAt(fCurrentChamberId))->CreateIterator();
+    fChamberIterator = static_cast<AliMpExMap*>(fkStore->fMap->UncheckedAt(fCurrentChamberId))->CreateIterator();
     
     o = NextInCurrentChamber();
   }
@@ -108,5 +105,5 @@ void AliMUONClusterStoreV2Iterator::Reset()
   /// Reset the iterator
   fCurrentChamberId = fFirstChamberId;
   delete fChamberIterator;
-  fChamberIterator = static_cast<AliMpExMap*>(fStore->fMap->UncheckedAt(fCurrentChamberId))->CreateIterator();
+  fChamberIterator = static_cast<AliMpExMap*>(fkStore->fMap->UncheckedAt(fCurrentChamberId))->CreateIterator();
 }