Changeset 14449


Ignore:
Timestamp:
Oct 2, 2012, 11:50:29 AM (7 years ago)
Author:
tbretz
Message:
Added some missing std::
Location:
trunk/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mbase/MEvtLoop.h

    r13364 r14449  
    3737    Bool_t HasDuplicateNames(TObjArray &arr, const TString txt) const;
    3838
    39     void StreamPrimitive(ostream &out) const;
     39    void StreamPrimitive(std::ostream &out) const;
    4040
    4141    Bool_t ProcessGuiEvents(Int_t num, Int_t rc);
     
    7777    void MakeMacro(const char *filename="evtloop.C");
    7878
    79     void SavePrimitive(ostream &out, Option_t *o="");
    80     void SavePrimitive(ofstream &out, Option_t *o="");
     79    void SavePrimitive(std::ostream &out, Option_t *o="");
     80    void SavePrimitive(std::ofstream &out, Option_t *o="");
    8181
    8282    Int_t Read(const char *name="Evtloop");
  • trunk/Mars/mcalib/MCalibrateData.h

    r12790 r14449  
    9090  Int_t  Process();
    9191  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    92   void   StreamPrimitive(ostream &out) const;
     92  void   StreamPrimitive(std::ostream &out) const;
    9393
    9494public:
  • trunk/Mars/mhist/MHCamera.h

    r13388 r14449  
    235235    void     DrawAzimuthProfile()          const;
    236236
    237     void     SavePrimitive(ostream &out, Option_t *);
    238     void     SavePrimitive(ofstream &out, Option_t *);
     237    void     SavePrimitive(std::ostream &out, Option_t *);
     238    void     SavePrimitive(std::ofstream &out, Option_t *);
    239239    Int_t    DistancetoPrimitive(Int_t px, Int_t py);
    240240    char    *GetObjectInfo(Int_t px, Int_t py) const;
  • trunk/Mars/mjobs/MSequence.h

    r12796 r14449  
    137137    TString GetNumSequence(Int_t &pos, const TArrayI &n, const TArrayI &f) const;
    138138
    139     void    PrintRunsClassic(ostream &out, const char *pre, const char *name, const TArrayI &r) const;
    140     TString PrintRuns(ostream &out, const char *pre, const char *name, const TArrayI &r, const TArrayI &f) const;
     139    void    PrintRunsClassic(std::ostream &out, const char *pre, const char *name, const TArrayI &r) const;
     140    TString PrintRuns(std::ostream &out, const char *pre, const char *name, const TArrayI &r, const TArrayI &f) const;
    141141
    142142    // General helper
     
    190190
    191191    // TObject
    192     void Print(ostream &out, Option_t *o) const;
     192    void Print(std::ostream &out, Option_t *o) const;
    193193    void Print(Option_t *o) const;
    194194    void Print() const { Print(""); } //*MENU*
  • trunk/Mars/mraw/MRawFileRead.h

    r14095 r14449  
    1717    UInt_t    fNumTotalEvents; //! total number of events in all files
    1818
    19     istream  *fIn;             //! input stream (file to read from)
     19    std::istream *fIn;         //! input stream (file to read from)
    2020
    2121    MParList *fParList;        //! tasklist to call ReInit from
     
    2525    Bool_t    fForce;
    2626
    27     virtual istream *OpenFile(const char *filename);
    28     virtual Bool_t   ReadRunHeader(istream &fin);
    29     virtual Bool_t   InitReadData(istream &fin) { return kTRUE; }
     27    virtual std::istream *OpenFile(const char *filename);
     28    virtual Bool_t        ReadRunHeader(std::istream &fin);
     29    virtual Bool_t        InitReadData(std::istream &fin) { return kTRUE; }
    3030
    3131    Int_t  OpenNextFile(Bool_t print=kTRUE);
  • trunk/Mars/mraw/MRawFitsRead.h

    r14089 r14449  
    1818    MRawBoardsFACT *fRawBoards;
    1919
    20     Int_t    PreProcess(MParList *pList);
    21     istream *OpenFile(const char *filename);
    22     Bool_t   ReadRunHeader(istream &fin);
    23     Bool_t   InitReadData(istream &fin);
    24     Bool_t   ReadEvent(istream &fin);
    25     void     SkipEvent(istream &fin);
     20    Int_t         PreProcess(MParList *pList);
     21    std::istream *OpenFile(const char *filename);
     22    Bool_t        ReadRunHeader(std::istream &fin);
     23    Bool_t        InitReadData(std::istream &fin);
     24    Bool_t        ReadEvent(std::istream &fin);
     25    void          SkipEvent(std::istream &fin);
    2626
    2727public:
Note: See TracChangeset for help on using the changeset viewer.