Changeset 3183 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/16/04 11:18:25 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MAGIC.h (modified) (1 diff)
• MArgs.h (modified) (1 diff)
• MLog.h (modified) (1 diff)
• MParContainer.cc (modified) (1 diff)
• MParContainer.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -44 +44 @@
 const Double_t kRad2Deg = 180.0/3.1415926535897932384626433832795028841971693993751;
 
-//
-// This is the definition of a global output stream, which by
-// default pipes all output to the stdout
-//
-
-#ifdef __LINUX__
-class MLog;
-#else
-#include "MLog.h"
 #endif
-
-R__EXTERN MLog gLog;
-
-#endif

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -1 +1 @@
 #ifndef MARS_MArgs
 #define MARS_MArgs
-
-#ifndef MARS_MAGIC
-#include "MAGIC.h"
-#endif
 
 #ifndef ROOT_TNamed

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -201 +201 @@
 };
 
-#endif
+//
+// This is the definition of a global output stream, which by
+// default pipes all output to the stdout
+//
+R__EXTERN MLog gLog;
+
+#endif

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -60 +60 @@
 using namespace std;
 
+MParContainer::MParContainer(const char *name, const char *title) :
+    fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE)
+{
+}
+
+MParContainer::MParContainer(const TString &name, const TString &title) :
+    fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE)
+{
+}
+
 // --------------------------------------------------------------------------
 //

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -12 +12 @@
 #include "MAGIC.h"
 #endif
-
 #ifndef ROOT_TObject
 #include <TObject.h>
@@ -28 +27 @@
 class TDataMember;
 class TMethodCall;
+
+class MLog;
 class MStatusDisplay;
 
@@ -60 +61 @@
     };
 
-    MParContainer(const char *name="", const char *title="") : fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE) {  }
-    MParContainer(const TString &name, const TString &title) : fName(name), fTitle(title), fLog(&gLog), fDisplay(NULL), fReadyToSave(kFALSE) {  }
+    MParContainer(const char *name="", const char *title="");
+    MParContainer(const TString &name, const TString &title);
     MParContainer(const MParContainer &named);
     MParContainer& operator=(const MParContainer& rhs);