Changeset 14447 for trunk/Mars/mraw

Timestamp:

10/02/12 11:44:41 (12 years ago)

Author:

tbretz

Message:

Added some missing std::

Location:

trunk/Mars/mraw

Files:

• MRawCrateData.h (modified) (2 diffs)
• MRawEvtData.h (modified) (1 diff)
• MRawEvtHeader.h (modified) (2 diffs)
• MRawRead.h (modified) (1 diff)
• MRawRunHeader.h (modified) (2 diffs)

trunk/Mars/mraw/MRawCrateData.h

@@ -18 +18 @@
     Byte_t   fABFlags;         // flag describing in which two-slice block the trigger was raised
 
-    Bool_t ReadEvtOld(istream& fin, UShort_t ver);
+    Bool_t ReadEvtOld(std::istream& fin, UShort_t ver);
 
 public:
@@ -30 +30 @@
     void Print(Option_t *t=NULL) const;
 
-    Bool_t ReadEvt(istream& fin, UShort_t ver, UInt_t size);
-    void   SkipEvt(istream& fin, UShort_t ver);
+    Bool_t ReadEvt(std::istream& fin, UShort_t ver, UInt_t size);
+    void   SkipEvt(std::istream& fin, UShort_t ver);
 
     ClassDef(MRawCrateData, 2) //Container to store the Raw CRATE DATA

trunk/Mars/mraw/MRawEvtData.h

@@ -110 +110 @@
     Bool_t HasStartCells() const;
 
-    void ReadPixel(istream &fin, Int_t npix);
+    void ReadPixel(std::istream &fin, Int_t npix);
     void SetABFlag(Int_t npix, Bool_t ab);
-    void SkipEvt(istream &fin);
+    void SkipEvt(std::istream &fin);
 
     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;

trunk/Mars/mraw/MRawEvtHeader.h

@@ -74 +74 @@
     Int_t GetNumBytes() const;
 
-    Int_t ReadEvtOld(istream& fin, UShort_t ver);
+    Int_t ReadEvtOld(std::istream& fin, UShort_t ver);
 
 public:
@@ -106 +106 @@
 
     // I/O
-    Int_t ReadEvt(istream& fin, UShort_t ver, UInt_t size);
-    void  SkipEvt(istream& fin, UShort_t ver);
+    Int_t ReadEvt(std::istream& fin, UShort_t ver, UInt_t size);
+    void  SkipEvt(std::istream& fin, UShort_t ver);
 
     ClassDef(MRawEvtHeader, 1) // Parameter Conatiner for raw EVENT HEADER

trunk/Mars/mraw/MRawRead.h

@@ -27 +27 @@
     void CreateFakeTime() const;
 
-    virtual Bool_t ReadEvent(istream &fin);
-    virtual void   SkipEvent(istream &fin);
+    virtual Bool_t ReadEvent(std::istream &fin);
+    virtual void   SkipEvent(std::istream &fin);
     Int_t  PreProcess(MParList *pList);
 

trunk/Mars/mraw/MRawRunHeader.h

@@ -80 +80 @@
     Bool_t IsConsistent() const;
 
-    Bool_t ReadEvtOld(istream& fin);
+    Bool_t ReadEvtOld(std::istream& fin);
 
     // MParContainer
@@ -187 +187 @@
     void Print(Option_t *t=NULL) const;
 
-    Bool_t ReadEvt(istream& fin);
+    Bool_t ReadEvt(std::istream& fin);
     //Bool_t WriteEvt(ostream& fout) const;