Changeset 14446

Timestamp:

10/02/12 11:15:33 (12 years ago)

Author:

tbretz

Message:

Added some missing std::

Location:

trunk/Mars/mbase

Files:

• MParList.h (modified) (2 diffs)
• MTime.h (modified) (3 diffs)

trunk/Mars/mbase/MParList.h

@@ -35 +35 @@
     enum { kIsOwner = BIT(14) };
 
-    void StreamPrimitive(ostream &out) const;
+    void StreamPrimitive(std::ostream &out) const;
 
     void Init(const char *name, const char *title);
@@ -99 +99 @@
     void SetNames(TObjArray &arr);
 
-    void SavePrimitive(ostream &out, Option_t *o="");
-    void SavePrimitive(ofstream &out, Option_t *o="");
+    void SavePrimitive(std::ostream &out, Option_t *o="");
+    void SavePrimitive(std::ofstream &out, Option_t *o="");
 
     Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);

trunk/Mars/mbase/MTime.h

@@ -155 +155 @@
 
     // I/O functions
-    istream &ReadBinary(istream &fin);
-    ostream &WriteBinary(ostream &out) const;
-
-    void AsciiRead(istream &fin);
-    Bool_t AsciiWrite(ostream &out) const;
+    std::istream &ReadBinary(std::istream &fin);
+    std::ostream &WriteBinary(std::ostream &out) const;
+
+    void AsciiRead(std::istream &fin);
+    Bool_t AsciiWrite(std::ostream &out) const;
 
     // Conversion functions
@@ -199 +199 @@
 };
 
-inline ostream &operator<<(ostream &out, const MTime &t)
+inline std::ostream &operator<<(std::ostream &out, const MTime &t)
 {
     out << t.GetString();
@@ -205 +205 @@
 }
 
-inline istream &operator>>(istream &in, MTime &t)
+inline std::istream &operator>>(std::istream &in, MTime &t)
 {
     TString date, time;