Changeset 2636 for trunk/MagicSoft/Mars/mbase

Timestamp:

12/11/03 11:48:32 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MTime.cc (modified) (2 diffs)
• MTime.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -239 +239 @@
     GetTime(h, m, s, ms);
 
-    return TString(Form("%2d/%02d/%02d %d:%02d:%02d.%03d", y, mon, d, h, m, s, ms));
+    return TString(Form("%2d/%02d/%02d %02d:%02d:%02d.%03d", y, mon, d, h, m, s, ms));
 }
 
@@ -273 +273 @@
     *fLog << GetString() << Form(" (+%dns)", fNanoSec) << endl;
 } 
+
+istream &MTime::ReadBinary(istream &fin)
+{
+    UShort_t y;
+    Byte_t mon, d, h, m, s;
+
+    fin.read((char*)&y,   2);
+    fin.read((char*)&mon, 1);
+    fin.read((char*)&d,   1);
+    fin.read((char*)&h,   1);
+    fin.read((char*)&m,   1);
+    fin.read((char*)&s,   1); // Total=7
+
+    Set(y, mon, d, h, m, s, 0);
+
+    return fin;
+}

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -12 +12 @@
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
+#endif
+
+#ifndef _CPP_IOSFWD
+#include <iosfwd>
 #endif
 
@@ -95 +99 @@
     UInt_t Sec() const   { Byte_t h, m, s; GetTime(h,m,s); return s; }
 
+    istream &ReadBinary(istream &fin);
+
     operator double() const   //[s]
     {