Option for customized binning (as in AliUEHist), EventMixing binning now derived...

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpExMapIterator.h

diff --git a/MUON/mapping/AliMpExMapIterator.h b/MUON/mapping/AliMpExMapIterator.h
index 5eb697d7a23a0908c5228c28a923053c6a548157..672afa90236fed37a38455f0add0572ca4fb95fc 100644 (file)
--- a/MUON/mapping/AliMpExMapIterator.h
+++ b/MUON/mapping/AliMpExMapIterator.h
@@ -17,13 +17,14 @@
 #endif
 
 class AliMpExMap;
-class AliMpIntPair;
 class TString;
 class TExMapIter;
 
 //_____________________________________________________________________________
 class AliMpExMapIterator : public TIterator
 {
+  friend class AliMpExMap;
+
 public:
   AliMpExMapIterator(const AliMpExMap& theMap);
   AliMpExMapIterator(const AliMpExMapIterator& rhs);
@@ -39,7 +40,7 @@ public:
 
   // Iterating with retrieving a key
   TObject*  Next(Int_t& key);
-  TObject*  Next(AliMpIntPair& key);
+  TObject*  Next(Int_t& keyFirst, Int_t& keySecond);
   TObject*  Next(TString& key);
   
   virtual void Reset(); 
@@ -47,10 +48,11 @@ public:
   virtual const TCollection* GetCollection() const;
 
 private:
-    
+#if ROOT_SVN_REVISION >= 29598
+    Bool_t Next(Long64_t& index, TObject*& object);
+#else    
     Bool_t Next(Long_t& index, TObject*& object);
-
-private:
+#endif    
   
     TExMapIter* fIterator; ///< iterator we are wrapping