Changeset 2219 for trunk


Ignore:
Timestamp:
06/23/03 15:41:08 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2218 r2219  
    157157     - added filename to canvas
    158158
     159   * mbase/MAGIC.h:
     160     - replaced extern by R__EXTERN
     161
     162   * mbase/MParContainer.[h,cc]:
     163     - added a non empty destructor with some debug options
     164
    159165
    160166

  • trunk/MagicSoft/Mars/mbase/MAGIC.h

    r1912 r2219  
    5353#endif
    5454
    55 extern MLog gLog;
     55R__EXTERN MLog gLog;
    5656
    5757#endif

  • trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

    r2209 r2219  
    110110
    111111    gROOT->GetListOfCleanups()->Add(this); // To remove fDisplay
     112    SetBit(kMustCleanup);
    112113
    113114    *fLog << inf << underline << "Instantiated MEvtLoop (" << name << "), using ROOT v" << ROOTVER << endl;
    … …  
    350351// for developers or use in special jobs only!
    351352//
    352 Bool_t MEvtLoop::Process(Int_t maxcnt)
     353Int_t MEvtLoop::Process(Int_t maxcnt)
    353354{
    354355    if (!fTaskList)

  • trunk/MagicSoft/Mars/mbase/MEvtLoop.h

    r2209 r2219  
    6161
    6262    Bool_t PreProcess(const char *tlist="MTaskList");
    63     Bool_t Process(Int_t maxcnt);
     63    Int_t Process(Int_t maxcnt);
    6464    Bool_t PostProcess() const;
    6565

  • trunk/MagicSoft/Mars/mbase/MParContainer.cc

    r2173 r2219  
    5757#endif
    5858
     59#undef DEBUG
     60//#define DEBUG
     61
    5962ClassImp(MParContainer);
    6063
    … …  
    7578
    7679    fDisplay = named.fDisplay;
     80}
     81
     82MParContainer::~MParContainer()
     83{
     84#ifdef DEBUG
     85    *fLog << all << "Deleting " << GetDescriptor() << endl;
     86#endif
    7787}
    7888

  • trunk/MagicSoft/Mars/mbase/MParContainer.h

    r2173 r2219  
    6363    MParContainer(const MParContainer &named);
    6464    MParContainer& operator=(const MParContainer& rhs);
    65     virtual ~MParContainer() {}
     65    virtual ~MParContainer();
    6666
    6767    virtual TObject    *Clone(const char *newname="") const;
Note: See TracChangeset for help on using the changeset viewer.