Changeset 2173 for trunk/MagicSoft/Mars/mbase/MLogManip.h

Timestamp:

06/13/03 16:42:37 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MLogManip.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MLogManip.h

@@ -2 +2 @@
 #define MARS_MLogManip
 
-#include <iomanip.h>
+#include <iomanip>
 
-// ----------------------------------------------------------------
-//                 Definitions of the manipulators
-// ----------------------------------------------------------------
+#include "MLog.h"
 
-//
-// define a general simple macro for manipulator definitions (int)
-//
-#define MANIPULATOR0(name) \
-   extern ostream& ##name(ostream& lout);
+// --------------------- simple manipulators -----------------------
 
-#ifndef OMANIP
-   #define MANIPULATOR1(name) \
-      extern ostream& __omanip_##name(ostream& lout, int i); \
-      inline omanip<int> ##name(int i)                \
-      {                                               \
-         return omanip<int>(__omanip_##name, i);     \
-      }
+enum MLogManip {
+    underline
+};
 
-#else
-   #define MANIPULATOR1(name) \
-       extern ostream& __omanip_##name(ostream& lout, int i); \
-       inline OMANIP(int) ##name(int i)                \
-       {                                               \
-          return OMANIP(int)(__omanip_##name, i);      \
-       }
+inline std::ostream &operator<<(std::ostream &lout, MLogManip u)
+{
+    MLog *log=/*<dynamic_cast>*/(MLog*)lout.rdbuf();
+    if (log)
+        log->Underline();
+    return lout;
+}
 
-#endif
 
-//
-// definitions
-//
-MANIPULATOR0(underline); // underline output
-MANIPULATOR1(debug);     // set debug level
-MANIPULATOR1(device);    // set ouput devices
-MANIPULATOR1(edev);      // enable additional output devices
-MANIPULATOR1(ddev);      // disable given output
-//#ifndef __CINT__
-//__DEFINE_IOMANIP_FN1(smanip, int, debug);    // set debug level
-//__DEFINE_IOMANIP_FN1(smanip, int, device);   // set ouput devices
-//__DEFINE_IOMANIP_FN1(smanip, int, edev);     // enable additional output devices
-//__DEFINE_IOMANIP_FN1(smanip, int, ddev);     // disable given output
-//#endif
+// ----------------------------- debug -----------------------------
 
-// ----------------------------------------------------------------
-//                         Debug helper macros
-// ----------------------------------------------------------------
+struct _Debug { int level; };
 
-//
-// Output debug information into the stream
-//  - this can only be done by a macro
-//
+inline _Debug debug(int level)
+{
+    _Debug d;
+    d.level = level;
+    return d;
+}
+
+inline std::ostream &operator<<(std::ostream &lout, _Debug d)
+{
+    MLog *log=/*<dynamic_cast>*/(MLog*)lout.rdbuf();
+    if (log)
+        log->SetOutputLevel(d.level);
+    return lout;
+}
+
+// ------------------------------- edev ----------------------------
+
+struct _EnableDev { MLog::_flags dev; };
+
+inline _EnableDev edev(MLog::_flags i)
+{
+    _EnableDev e;
+    e.dev = i;
+    return e;
+}
+
+inline std::ostream &operator<<(std::ostream &lout, _EnableDev e)
+{
+    MLog *log=/*<dynamic_cast>*/(MLog*)lout.rdbuf();
+    if (log)
+        log->EnableOutputDevice(e.dev);
+    return lout;
+}
+
+// ------------------------------- sdev ----------------------------
+
+struct _DisableDev { MLog::_flags dev; };
+
+inline _DisableDev ddev(MLog::_flags i)
+{
+    _DisableDev d;
+    d.dev = i;
+    return d;
+}
+
+inline std::ostream &operator<<(std::ostream &lout, _DisableDev d)
+{
+    MLog *log=/*<dynamic_cast>*/(MLog*)lout.rdbuf();
+    if (log)
+        log->EnableOutputDevice(d.dev);
+    return lout;
+}
+
+// ------------------------------ Macros ---------------------------
+
 #ifndef __CINT__
-//#define dbginf dbg << __FILE__ << " l." << dec << __LINE__ << ": "
 #define dbginf __FILE__ << " l." << dec << __LINE__ << ": "
 #define all    debug(0) // use this for output in any case
@@ -64 +88 @@
 #define dbg    debug(4) // use this for debug messages (blue)
 #endif
-//
-// flush the old buffer, set a new debug level
-// and output the debug information code
-//
-// Be careful: Only use them with a MLogging stream facility.
-// Remark:     All this is compiled into the code.
-//
-/*
-#ifndef __CINT__
-#define DEBUG(lvl)  flush << debug(lvl) << dbginf
-#endif
-*/
-/*
-class SMANIP(T) {
-    ios& (*fct)(ios&,T) ;
-    T arg ;
-public:
-    SMANIP(T)(ios& (*f)(ios&, T), T a) :
-        fct(f), arg(a) { }
-        friend istream& operator>>(istream& i, const SMANIP(T)& m)
-        {
-            ios* s = &i ;
-            (*m.fct)(*s,m.arg) ; return i ;
-        }
-        friend ostream& operator<<(ostream& o, const SMANIP(T)& m)
-        {
-            ios* s = &o ;
-            (*m.fct)(*s,m.arg) ; return o ;
-        }
-} ;
-*/
 
 #endif