Changeset 14449 for trunk

Timestamp:

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

Author:

tbretz

Message:

Added some missing std::

Location:

trunk/Mars

Files:

• mbase/MEvtLoop.h (modified) (2 diffs)
• mcalib/MCalibrateData.h (modified) (1 diff)
• mhist/MHCamera.h (modified) (1 diff)
• mjobs/MSequence.h (modified) (2 diffs)
• mraw/MRawFileRead.h (modified) (2 diffs)
• mraw/MRawFitsRead.h (modified) (1 diff)

trunk/Mars/mbase/MEvtLoop.h

@@ -37 +37 @@
     Bool_t HasDuplicateNames(TObjArray &arr, const TString txt) const;
 
-    void StreamPrimitive(ostream &out) const;
+    void StreamPrimitive(std::ostream &out) const;
 
     Bool_t ProcessGuiEvents(Int_t num, Int_t rc);
@@ -77 +77 @@
     void MakeMacro(const char *filename="evtloop.C");
 
-    void SavePrimitive(ostream &out, Option_t *o="");
-    void SavePrimitive(ofstream &out, Option_t *o="");
+    void SavePrimitive(std::ostream &out, Option_t *o="");
+    void SavePrimitive(std::ofstream &out, Option_t *o="");
 
     Int_t Read(const char *name="Evtloop");

trunk/Mars/mcalib/MCalibrateData.h

@@ -90 +90 @@
   Int_t  Process();
   Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
-  void   StreamPrimitive(ostream &out) const;
+  void   StreamPrimitive(std::ostream &out) const;
 
 public:

trunk/Mars/mhist/MHCamera.h

@@ -235 +235 @@
     void     DrawAzimuthProfile()          const;
 
-    void     SavePrimitive(ostream &out, Option_t *);
-    void     SavePrimitive(ofstream &out, Option_t *);
+    void     SavePrimitive(std::ostream &out, Option_t *);
+    void     SavePrimitive(std::ofstream &out, Option_t *);
     Int_t    DistancetoPrimitive(Int_t px, Int_t py);
     char    *GetObjectInfo(Int_t px, Int_t py) const;

trunk/Mars/mjobs/MSequence.h

@@ -137 +137 @@
     TString GetNumSequence(Int_t &pos, const TArrayI &n, const TArrayI &f) const;
 
-    void    PrintRunsClassic(ostream &out, const char *pre, const char *name, const TArrayI &r) const;
-    TString PrintRuns(ostream &out, const char *pre, const char *name, const TArrayI &r, const TArrayI &f) const;
+    void    PrintRunsClassic(std::ostream &out, const char *pre, const char *name, const TArrayI &r) const;
+    TString PrintRuns(std::ostream &out, const char *pre, const char *name, const TArrayI &r, const TArrayI &f) const;
 
     // General helper
@@ -190 +190 @@
 
     // TObject
-    void Print(ostream &out, Option_t *o) const;
+    void Print(std::ostream &out, Option_t *o) const;
     void Print(Option_t *o) const;
     void Print() const { Print(""); } //*MENU*

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: