Changeset 14935 for trunk/Mars/mreport


Ignore:
Timestamp:
02/20/13 14:49:37 (12 years ago)
Author:
tbretz
Message:
Add changes necessary to remove fits completely from namespace std in MARS.
Location:
trunk/Mars/mreport
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mreport/MReport.h

    r12776 r14935  
    99#endif
    1010
    11 namespace std
    12 {
    13     class fits;
    14 }
     11class fits;
     12
    1513class MTime;
    1614class MParList;
    … …  
    3735
    3836    virtual Bool_t SetupReading(MParList &plist);
    39     virtual Bool_t SetupReadingFits(std::fits &fits) { return kTRUE; }
     37    virtual Bool_t SetupReadingFits(fits &) { return kTRUE; }
    4038    virtual Int_t  InterpreteBody(TString &str, Int_t ver);
    4139
    4240    Int_t  Interprete(TString &str, const MTime &start, const MTime &stop, const Int_t ver);
    43     virtual Int_t  InterpreteFits(const std::fits &fits) { return kTRUE; }
     41    virtual Int_t  InterpreteFits(const fits &) { return kTRUE; }
    4442    Bool_t CheckIdentifier(TString &str) const
    4543    {

  • trunk/Mars/mreport/MReportCC.cc

    r12773 r14935  
    255255}
    256256
    257 Bool_t MReportWeather::SetupReadingFits(std::fits &file)
     257Bool_t MReportWeather::SetupReadingFits(fits &file)
    258258{
    259259    return

  • trunk/Mars/mreport/MReportCC.h

    r12773 r14935  
    1919    Float_t fSolarRadiation;  // [W/m^2] IR-Radiation
    2020
    21     Bool_t SetupReadingFits(std::fits &fits);
     21    Bool_t SetupReadingFits(fits &fits);
    2222
    2323public:

  • trunk/Mars/mreport/MReportDrive.cc

    r14861 r14935  
    8888}
    8989
    90 Bool_t MReportDrive::SetupReadingFits(std::fits &file)
     90Bool_t MReportDrive::SetupReadingFits(fits &file)
    9191{
    9292    return
    … …  
    100100}
    101101
    102 Int_t MReportDrive::InterpreteFits(const std::fits &fits)
     102Int_t MReportDrive::InterpreteFits(const fits &fits)
    103103{
    104104    fCurrentZd = fNominalZd - fErrorZd;

  • trunk/Mars/mreport/MReportDrive.h

    r12734 r14935  
    2323    Double_t fErrorAz;    // [deg] sistem error in the azimuth angle axis
    2424
    25     Bool_t SetupReadingFits(std::fits &fits);
    26     Int_t  InterpreteFits(const std::fits &fits);
     25    Bool_t SetupReadingFits(fits &fits);
     26    Int_t  InterpreteFits(const fits &fits);
    2727    Int_t  InterpreteBody(TString &str, Int_t ver);
    2828

  • trunk/Mars/mreport/MReportFitsRead.h

    r14483 r14935  
    1717#include <map>
    1818
    19 namespace std
    20 {
    21     class fits;
    22 }
     19class fits;
    2320class THashTable;
    2421
    … …  
    5249
    5350protected:
    54     std::fits *fIn;         //! buffered input stream (file to read from)
     51    fits *fIn;         //! buffered input stream (file to read from)
    5552
    5653public:

  • trunk/Mars/mreport/MReportHumidity.cc

    r12861 r14935  
    5151}
    5252
    53 Bool_t MReportHumidity::SetupReadingFits(std::fits &file)
     53Bool_t MReportHumidity::SetupReadingFits(fits &file)
    5454{
    5555    return
    … …  
    5858}
    5959
    60 Int_t MReportHumidity::InterpreteFits(const std::fits &fits)
     60Int_t MReportHumidity::InterpreteFits(const fits &fits)
    6161{
    6262    return kTRUE;

  • trunk/Mars/mreport/MReportHumidity.h

    r12861 r14935  
    1212    Float_t fHumidity[4]; // H[%] Humidity sensors readout
    1313
    14     Bool_t SetupReadingFits(std::fits &fits);
    15     Int_t  InterpreteFits(const std::fits &fits);
     14    Bool_t SetupReadingFits(fits &fits);
     15    Int_t  InterpreteFits(const fits &fits);
    1616
    1717public:

  • trunk/Mars/mreport/MReportRates.cc

    r12862 r14935  
    5353}
    5454
    55 Bool_t MReportRates::SetupReadingFits(std::fits &file)
     55Bool_t MReportRates::SetupReadingFits(fits &file)
    5656{
    5757    return
    … …  
    6666}
    6767
    68 Int_t MReportRates::InterpreteFits(const std::fits &fits)
     68Int_t MReportRates::InterpreteFits(const fits &fits)
    6969{
    7070    if (fElapsedTime>0 || fElapsedOnTime>0)

  • trunk/Mars/mreport/MReportRates.h

    r12860 r14935  
    1818    Float_t   fElapsedOnTime;   // [s]  On-time elapsed since previous report
    1919
    20     Bool_t SetupReadingFits(std::fits &fits);
    21     Int_t  InterpreteFits(const std::fits &fits);
     20    Bool_t SetupReadingFits(fits &fits);
     21    Int_t  InterpreteFits(const fits &fits);
    2222
    2323public:

  • trunk/Mars/mreport/MReportTemperatures.cc

    r12861 r14935  
    5656}
    5757
    58 Bool_t MReportTemperatures::SetupReadingFits(std::fits &file)
     58Bool_t MReportTemperatures::SetupReadingFits(fits &file)
    5959{
    6060    return
    … …  
    6868}
    6969
    70 Int_t MReportTemperatures::InterpreteFits(const std::fits &fits)
     70Int_t MReportTemperatures::InterpreteFits(const fits &fits)
    7171{
    7272    return kTRUE;

  • trunk/Mars/mreport/MReportTemperatures.h

    r12861 r14935  
    1717    Float_t fTempEthernet[4];  // [deg C] Ethernet switches temperatures top (front/back), bottom (front/back)
    1818
    19     Bool_t SetupReadingFits(std::fits &fits);
    20     Int_t  InterpreteFits(const std::fits &fits);
     19    Bool_t SetupReadingFits(fits &fits);
     20    Int_t  InterpreteFits(const fits &fits);
    2121
    2222public:
Note: See TracChangeset for help on using the changeset viewer.