Ignore:
Timestamp:
03/14/07 19:12:17 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy/base
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/base/MStarList.cc

    r1810 r8376  
    11#include "MStarList.h"
    22
    3 #include <iostream.h>
     3#include <iostream>
     4
     5using namespace std;
    46
    57void MStarList::RemoveTwins(Double_t radius)

  • trunk/MagicSoft/Cosy/base/MStarList.h

    r1810 r8376  
    3131    }
    3232
    33     void Delete(Int_t i)    { delete fStars.RemoveAt(i); }
    34     void Delete(MStar *obj) { delete fStars.Remove(obj); }
     33    void Delete(Option_t *o="") { }
     34    void Delete(Int_t i)        { delete fStars.RemoveAt(i); }
     35    void Delete(MStar *obj)     { delete fStars.Remove(obj); }
    3536
    3637    Int_t GetMax() const { return fStars.GetLast()+1; }

  • trunk/MagicSoft/Cosy/base/MStopwatch.h

    r732 r8376  
    88public:
    99    void Print(Float_t i);
     10    void Print(Option_t *o="") const { }
    1011};
    1112

  • trunk/MagicSoft/Cosy/base/MThread.cc

    r2407 r8376  
    11#include <MThread.h>
    22
    3 #include <iostream.h>
     3#include <iostream>
    44
    55#include <pthread.h>
    … …  
    88#undef DEBUG
    99//#define DEBUG
     10
     11using namespace std;
    1012
    1113// ----------------------------------------------------------------------

  • trunk/MagicSoft/Cosy/base/MTimeout.cc

    r2518 r8376  
    33#include <TSystem.h>
    44
    5 MTimeout::MTimeout(unsigned long ms=500) : fTimeout((ULong_t)gSystem->Now()+ms)
     5MTimeout::MTimeout(unsigned long ms) : fTimeout((ULong_t)gSystem->Now()+ms)
    66{
    77    // Use SetTime to change the timing
    … …  
    1414}
    1515
    16 void MTimeout::Start(unsigned long ms=500)
     16void MTimeout::Start(unsigned long ms)
    1717{
    1818    fTimeout = (ULong_t)gSystem->Now()+ms;

  • trunk/MagicSoft/Cosy/base/coord.h

    r4076 r8376  
    33
    44#include <math.h>          // floor
    5 #include <fstream.h>
     5#include <iostream>
    66
    77#include "MAGIC.h"
    … …  
    3737class XY
    3838{
    39     friend ifstream& operator>>(ifstream &in, XY &xy);
    40     friend ofstream& operator<<(ofstream &in, XY &xy);
     39    friend istream& operator>>(istream &in, XY &xy);
     40    friend ostream& operator<<(ostream &in, XY &xy);
    4141
    4242protected:
    … …  
    7373};
    7474
    75 inline ifstream& operator>>(ifstream &in,  XY &xy) { in  >> xy.fX; in  >> xy.fY; return in; }
    76 inline ofstream& operator<<(ofstream &out, const XY &xy) { out << xy.X() << " " << xy.Y(); return out; }
     75inline std::istream& operator>>(std::istream &in,  XY &xy) { in  >> xy.fX; in  >> xy.fY; return in; }
     76inline std::ostream& operator<<(std::ostream &out, const XY &xy) { out << xy.X() << " " << xy.Y(); return out; }
    7777
    7878class AltAz : public XY

  • trunk/MagicSoft/Cosy/base/log.h

    r2384 r8376  
    22#define COSY_Log
    33
    4 #include <ostream.h>
     4#include <ostream>
    55
    66#ifndef MARS_MLog

  • trunk/MagicSoft/Cosy/base/msgqueue.cc

    r4076 r8376  
    11#include "msgqueue.h"
    22
    3 #include <iostream.h>
     3#include <iostream>
    44
    55#include <unistd.h>        // usleep
    … …  
    77
    88#undef DEBUG
     9
     10using namespace std;
    911
    1012// --------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.