Changeset 14449 for trunk/Mars/mraw

Timestamp:

10/02/12 11:50:29 (12 years ago)

Author:

tbretz

Message:

Added some missing std::

Location:

trunk/Mars/mraw

Files:

• MRawFileRead.h (modified) (2 diffs)
• MRawFitsRead.h (modified) (1 diff)

trunk/Mars/mraw/MRawFileRead.h

@@ -17 +17 @@
     UInt_t    fNumTotalEvents; //! total number of events in all files
 
-    istream  *fIn;             //! input stream (file to read from)
+    std::istream *fIn;         //! input stream (file to read from)
 
     MParList *fParList;        //! tasklist to call ReInit from
@@ -25 +25 @@
     Bool_t    fForce;
 
-    virtual istream *OpenFile(const char *filename);
-    virtual Bool_t   ReadRunHeader(istream &fin);
-    virtual Bool_t   InitReadData(istream &fin) { return kTRUE; }
+    virtual std::istream *OpenFile(const char *filename);
+    virtual Bool_t        ReadRunHeader(std::istream &fin);
+    virtual Bool_t        InitReadData(std::istream &fin) { return kTRUE; }
 
     Int_t  OpenNextFile(Bool_t print=kTRUE);

trunk/Mars/mraw/MRawFitsRead.h

@@ -18 +18 @@
     MRawBoardsFACT *fRawBoards;
 
-    Int_t    PreProcess(MParList *pList);
-    istream *OpenFile(const char *filename);
-    Bool_t   ReadRunHeader(istream &fin);
-    Bool_t   InitReadData(istream &fin);
-    Bool_t   ReadEvent(istream &fin);
-    void     SkipEvent(istream &fin);
+    Int_t         PreProcess(MParList *pList);
+    std::istream *OpenFile(const char *filename);
+    Bool_t        ReadRunHeader(std::istream &fin);
+    Bool_t        InitReadData(std::istream &fin);
+    Bool_t        ReadEvent(std::istream &fin);
+    void          SkipEvent(std::istream &fin);
 
 public: