Changes needed on Sun with Root v4-03-04

[u/mrichter/AliRoot.git] / MUON / AliMUONSt1Decoder.h

diff --git a/MUON/AliMUONSt1Decoder.h b/MUON/AliMUONSt1Decoder.h
index 85630763f3c9e2a1309a2de9bcde955a28c1b50e..1b7164d799db829c1b559d343840f14f853aac02 100644 (file)
--- a/MUON/AliMUONSt1Decoder.h
+++ b/MUON/AliMUONSt1Decoder.h
@@ -4,6 +4,7 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */

+// Revision of includes 07/05/2004

 
 // Authors: David Guez, Ivana Hrivnacova, Marion MacCormick; IPN Orsay
 //
 
 // Authors: David Guez, Ivana Hrivnacova, Marion MacCormick; IPN Orsay
 //


@@ -18,24 +19,37 @@
 //                                                         |
 //                                             this is just ONE substring.
 
 //                                                         |
 //                                             this is just ONE substring.
 

-
-#include <vector>
-#include <utility>
+#include <Rtypes.h>

 #include <string>
 #include <string>

-#include <cstdlib>
+#include <utility>
+#include <vector>
+
+#ifndef __HP_aCC
+  using std::string;
+  using std::pair;
+  using std::vector;
+#endif  
+
+typedef vector<string>  StringVector; 
+typedef vector<Int_t>   IntVector; 
+typedef pair<Int_t, Int_t> IntPair;
+typedef vector<IntPair>    IntPairVector;
+typedef pair<Double_t, Double_t>  DoublePair;
+typedef vector<DoublePair>        DoublePairVector;

 
 namespace decoder
 {
 
 namespace decoder
 {

-  using std::vector;
-  using std::pair;
-  using std::string;
-  vector<string> SplitNtuples(const string& s,
-                              const string& leftSep ="({[\"'/",
-                              const string& rightSep=")}]\"'/");
-  vector<string> SplitList(const string& s,const string& sep=";,");
-  vector<int> DecodeListRanges(const string& s,const string& sep=";,",const string& rangeSep="/");
-  vector< pair<int,int> > DecodeListOfIntRanges(const string& s,const string& sep=";,",const string& rangeSep="/");
-  vector< pair<double,double> > DecodeListOfFloatRanges(const string& s,const string& sep=";,",const string& rangeSep="/");
+  StringVector     SplitNtuples(const string& s,
+                                const string& leftSep ="({[\"'/",
+                                const string& rightSep=")}]\"'/");
+  StringVector     SplitList(const string& s, const string& sep=";,");
+
+  IntVector        DecodeListRanges(const string& s, const string& sep=";,",
+                                    const string& rangeSep="/");
+  IntPairVector    DecodeListOfIntRanges(const string& s, const string& sep=";,",
+                                    const string& rangeSep="/");
+  DoublePairVector DecodeListOfFloatRanges(const string& s, const string& sep=";,",
+                                    const string& rangeSep="/");

 }
 
 #endif //ALI_MUON_ST1_DECODER_H 
 }
 
 #endif //ALI_MUON_ST1_DECODER_H