Changeset 14447 for trunk


Ignore:
Timestamp:
10/02/12 11:44:41 (12 years ago)
Author:
tbretz
Message:
Added some missing std::
Location:
trunk/Mars
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/manalysis/MEventRateCalc.h

    r7804 r14447  
    4545    Int_t  Process();
    4646
    47     void  StreamPrimitive(ostream &out) const;
     47    void  StreamPrimitive(std::ostream &out) const;
    4848    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    4949

  • trunk/Mars/manalysis/MGeomApply.h

    r7804 r14447  
    2222    Int_t  PreProcess(MParList *plist);
    2323    Bool_t ReInit(MParList *pList);
    24     void   StreamPrimitive(ostream &out) const;
     24    void   StreamPrimitive(std::ostream &out) const;
    2525
    2626public:

  • trunk/Mars/manalysis/MMultiDimDistCalc.h

    r7804 r14447  
    2626    MDataArray  *fData;       //! Used to store the MDataChains to get the event values
    2727
    28     void  StreamPrimitive(ostream &out) const;
     28    void  StreamPrimitive(std::ostream &out) const;
    2929
    3030    Int_t PreProcess(MParList *plist);

  • trunk/Mars/mastro/MVector3.h

    r8907 r14447  
    4747    const char *GetName() const { return fName; }
    4848
    49     void WriteBinary(ostream &out) const;
    50     void ReadBinary(istream &in);
     49    void WriteBinary(std::ostream &out) const;
     50    void ReadBinary(std::istream &in);
    5151
    5252    ClassDef(MVector3, 1) // A specialized TVector3 storing a star-name

  • trunk/Mars/mbase/MLut.h

    r9490 r14447  
    4848
    4949    // MLut I/O
    50     Int_t ReadStream(istream &in);
    51     Int_t WriteStream(ostream &out) const;
     50    Int_t ReadStream(std::istream &in);
     51    Int_t WriteStream(std::ostream &out) const;
    5252
    5353    Int_t ReadFile(const char *fname);

  • trunk/Mars/mbase/MReadSocket.h

    r7808 r14447  
    3434public:
    3535    MReadSocket(int port=-1, int mtu=1500);
    36     MReadSocket(MReadSocket const& log) : std::ios(), std::streambuf(), istream((std::streambuf*)&log)
     36    MReadSocket(MReadSocket const& log) : std::ios(), std::streambuf(), std::istream((std::streambuf*)&log)
    3737    {
    3838    }

  • trunk/Mars/mbase/MTask.h

    r9578 r14447  
    120120    virtual Int_t CallPostProcess();
    121121
    122     void SavePrimitive(ostream &out, Option_t *o="");
    123     void SavePrimitive(ofstream &out, Option_t *o="");
     122    void SavePrimitive(std::ostream &out, Option_t *o="");
     123    void SavePrimitive(std::ofstream &out, Option_t *o="");
    124124
    125125    // TObject

  • trunk/Mars/mbase/MTaskList.h

    r8642 r14447  
    3434
    3535    void   Remove(MTask *task);
    36     void   StreamPrimitive(ostream &out) const;
     36    void   StreamPrimitive(std::ostream &out) const;
    3737    Bool_t CheckAddToList(MTask *task, /*const char *tType,*/ const MTask *where=NULL) const;
    3838    Int_t  ProcessTaskList();

  • trunk/Mars/mcorsika/MCorsikaRunHeader.h

    r10060 r14447  
    126126    Bool_t ReadEventHeader(Float_t * g);
    127127    Bool_t ReadEvtEnd(MCorsikaFormat * fInFormat, Bool_t runNumberVerify);
    128     Bool_t SeekEvtEnd(istream &fin);
     128    Bool_t SeekEvtEnd(std::istream &fin);
    129129
    130130    // TObject

  • trunk/Mars/mfileio/MReadTree.h

    r9036 r14447  
    5656
    5757    virtual void SetReadyToSave(Bool_t flag=kTRUE);
    58     virtual void StreamPrimitive(ostream &out) const;
     58    virtual void StreamPrimitive(std::ostream &out) const;
    5959
    6060    enum { kIsOwner = BIT(14) };

  • trunk/Mars/mfileio/MWriteAsciiFile.h

    r4694 r14447  
    1414{
    1515private:
    16     ofstream *fOut;    //! ascii file
     16    std::ofstream *fOut; //! ascii file
    1717
    18     TString fNameFile;  // name of the ascii file
     18    TString fNameFile;   // name of the ascii file
    1919
    20     TObjArray fList;    // list of rules and containers to be written
    21     TObjArray fAutoDel; //! List of object to be deleted in the destructor
     20    TObjArray fList;     // list of rules and containers to be written
     21    TObjArray fAutoDel;  //! List of object to be deleted in the destructor
    2222
    2323    virtual Bool_t CheckAndWrite();

  • trunk/Mars/mfileio/MWriteRootFile.h

    r9410 r14447  
    108108    // MTask
    109109    Bool_t ReInit(MParList *pList);
    110     void   StreamPrimitive(ostream &out) const;
     110    void   StreamPrimitive(std::ostream &out) const;
    111111
    112112    // Constructor

  • trunk/Mars/mfilter/MFParticleId.h

    r7804 r14447  
    3030              const char *name, const char *title);
    3131
    32     void StreamPrimitive(ostream &out) const;
     32    void StreamPrimitive(std::ostream &out) const;
    3333
    3434    Int_t PreProcess(MParList *pList);

  • trunk/Mars/mfilter/MFTriggerLvl1.h

    r7804 r14447  
    3030              const char *name, const char *title);
    3131
    32     void StreamPrimitive(ostream &out) const;
     32    void StreamPrimitive(std::ostream &out) const;
    3333
    3434    Int_t PreProcess(MParList *pList);

  • trunk/Mars/mfilter/MFTriggerLvl2.h

    r7804 r14447  
    3636              const char *name, const char *title);
    3737
    38     void StreamPrimitive(ostream &out) const;
     38    void StreamPrimitive(std::ostream &out) const;
    3939
    4040    Int_t PreProcess(MParList *pList);

  • trunk/Mars/mgui/MHexagon.h

    r9385 r14447  
    7272    virtual void  PaintHexagon(Float_t x, Float_t y, Float_t d, Float_t phi=0);
    7373    virtual void  Print(Option_t *Option="") const; // *MENU*
    74     virtual void  SavePrimitive(ostream &out, Option_t *);
    75     virtual void  SavePrimitive(ofstream &out, Option_t *);
     74    virtual void  SavePrimitive(std::ostream &out, Option_t *);
     75    virtual void  SavePrimitive(std::ofstream &out, Option_t *);
    7676
    7777    Float_t GetX() const { return fX; }

  • trunk/Mars/mhbase/MBinning.h

    r8957 r14447  
    2727    Byte_t  fType;
    2828
    29     void StreamPrimitive(ostream &out) const;
     29    void StreamPrimitive(std::ostream &out) const;
    3030
    3131    enum {

  • trunk/Mars/mhbase/MFillH.h

    r9520 r14447  
    4646    void Init(const char *name, const char *title);
    4747
    48     void StreamPrimitive(ostream &out) const;
     48    void StreamPrimitive(std::ostream &out) const;
    4949
    5050    Bool_t DrawToDisplay();

  • trunk/Mars/mhbase/MH3.h

    r10234 r14447  
    7878    void HandleLogAxis(TAxis &axe) const;
    7979
    80     void StreamPrimitive(ostream &out) const;
     80    void StreamPrimitive(std::ostream &out) const;
    8181
    8282

  • trunk/Mars/mhbase/MHMatrix.h

    r9153 r14447  
    6161    void GetRandomArrayI(TArrayI &ind) const;
    6262
    63     void StreamPrimitive(ostream &out) const;
     63    void StreamPrimitive(std::ostream &out) const;
    6464
    6565public:

  • trunk/Mars/mimage/MHillasCalc.h

    r7804 r14447  
    6868
    6969    // MParContainer
    70     void StreamPrimitive(ostream &out) const;
     70    void StreamPrimitive(std::ostream &out) const;
    7171
    7272    Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);

  • trunk/Mars/mimage/MImgCleanStd.h

    r9369 r14447  
    7272    Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    7373
    74     void    StreamPrimitive(ostream &out) const;
     74    void    StreamPrimitive(std::ostream &out) const;
    7575
    7676    Int_t PreProcess(MParList *pList);

  • trunk/Mars/mjobs/MDataSet.h

    r9460 r14447  
    4848    void ResolveSequences(const TEnv &env, const TString &prefix, const TArrayI &num, TList &list/*, const TString &sequences, const TString &data*/) const;
    4949    Bool_t GetWobbleMode(const TEnv &env, const TString &prefix) const;
    50     static void PrintFile(ostream &out, const MSequence &obj);
    51     void PrintSeq(ostream &out, const MSequence &seq) const;
     50    static void PrintFile(std::ostream &out, const MSequence &obj);
     51    void PrintSeq(std::ostream &out, const MSequence &seq) const;
    5252
    5353    // Directory and file handling
    … …  
    182182
    183183    // TObject
    184     void Print(ostream &out, Option_t *o) const;
     184    void Print(std::ostream &out, Option_t *o) const;
    185185    void Print(Option_t *o) const;
    186186    void Print() const { Print(""); } //*MENU*

  • trunk/Mars/mpointing/MSrcPosCam.h

    r8912 r14447  
    3838    void Print(Option_t *opt=NULL) const;
    3939
    40     void StreamPrimitive(ostream &out) const;
     40    void StreamPrimitive(std::ostream &out) const;
    4141
    4242    //void AsciiRead(ifstream &fin);

  • trunk/Mars/mranforest/MRanForest.h

    r8644 r14447  
    125125    Double_t CalcHadroness();
    126126
    127     Bool_t AsciiWrite(ostream &out) const;
     127    Bool_t AsciiWrite(std::ostream &out) const;
    128128
    129129    ClassDef(MRanForest, 1) // Storage container for tree structure

  • trunk/Mars/mranforest/MRanTree.h

    r7804 r14447  
    112112    Double_t TreeHad(const TMatrix &m, Int_t ievt);
    113113
    114     Bool_t AsciiWrite(ostream &out) const;
     114    Bool_t AsciiWrite(std::ostream &out) const;
    115115
    116116    ClassDef(MRanTree, 1) // Storage container for tree structure

  • trunk/Mars/mraw/MRawCrateData.h

    r8944 r14447  
    1818    Byte_t   fABFlags;         // flag describing in which two-slice block the trigger was raised
    1919
    20     Bool_t ReadEvtOld(istream& fin, UShort_t ver);
     20    Bool_t ReadEvtOld(std::istream& fin, UShort_t ver);
    2121
    2222public:
    … …  
    3030    void Print(Option_t *t=NULL) const;
    3131
    32     Bool_t ReadEvt(istream& fin, UShort_t ver, UInt_t size);
    33     void   SkipEvt(istream& fin, UShort_t ver);
     32    Bool_t ReadEvt(std::istream& fin, UShort_t ver, UInt_t size);
     33    void   SkipEvt(std::istream& fin, UShort_t ver);
    3434
    3535    ClassDef(MRawCrateData, 2) //Container to store the Raw CRATE DATA

  • trunk/Mars/mraw/MRawEvtData.h

    r11555 r14447  
    110110    Bool_t HasStartCells() const;
    111111
    112     void ReadPixel(istream &fin, Int_t npix);
     112    void ReadPixel(std::istream &fin, Int_t npix);
    113113    void SetABFlag(Int_t npix, Bool_t ab);
    114     void SkipEvt(istream &fin);
     114    void SkipEvt(std::istream &fin);
    115115
    116116    Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;

  • trunk/Mars/mraw/MRawEvtHeader.h

    r9574 r14447  
    7474    Int_t GetNumBytes() const;
    7575
    76     Int_t ReadEvtOld(istream& fin, UShort_t ver);
     76    Int_t ReadEvtOld(std::istream& fin, UShort_t ver);
    7777
    7878public:
    … …  
    106106
    107107    // I/O
    108     Int_t ReadEvt(istream& fin, UShort_t ver, UInt_t size);
    109     void  SkipEvt(istream& fin, UShort_t ver);
     108    Int_t ReadEvt(std::istream& fin, UShort_t ver, UInt_t size);
     109    void  SkipEvt(std::istream& fin, UShort_t ver);
    110110
    111111    ClassDef(MRawEvtHeader, 1) // Parameter Conatiner for raw EVENT HEADER

  • trunk/Mars/mraw/MRawRead.h

    r11430 r14447  
    2727    void CreateFakeTime() const;
    2828
    29     virtual Bool_t ReadEvent(istream &fin);
    30     virtual void   SkipEvent(istream &fin);
     29    virtual Bool_t ReadEvent(std::istream &fin);
     30    virtual void   SkipEvent(std::istream &fin);
    3131    Int_t  PreProcess(MParList *pList);
    3232

  • trunk/Mars/mraw/MRawRunHeader.h

    r11869 r14447  
    8080    Bool_t IsConsistent() const;
    8181
    82     Bool_t ReadEvtOld(istream& fin);
     82    Bool_t ReadEvtOld(std::istream& fin);
    8383
    8484    // MParContainer
    … …  
    187187    void Print(Option_t *t=NULL) const;
    188188
    189     Bool_t ReadEvt(istream& fin);
     189    Bool_t ReadEvt(std::istream& fin);
    190190    //Bool_t WriteEvt(ostream& fout) const;
    191191

  • trunk/Mars/msignal/MExtractor.h

    r11568 r14447  
    7373  Bool_t  ReInit    ( MParList *pList );
    7474  Int_t   Process   ();
    75   void    StreamPrimitive(ostream &out) const;
     75  void    StreamPrimitive(std::ostream &out) const;
    7676  Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
    7777

  • trunk/Mars/mtools/MChisqEval.h

    r8679 r14447  
    2727    Double_t     fSumW;    //! Sum of weights
    2828
    29     void StreamPrimitive(ostream &out) const;
     29    void StreamPrimitive(std::ostream &out) const;
    3030
    3131    enum { kIsOwner = BIT(14) };
Note: See TracChangeset for help on using the changeset viewer.