Changeset 2051

Timestamp:

Sep 6, 2009, 6:47:19 PM (14 years ago)

Author:

Peter

Message:

the conclusion that the stream needed to flushed was nonsense, so I changed back to having and ios* as member variable. refs #521

File:

• trunk/yat/utility/StreamRedirect.h (modified) (7 diffs)

trunk/yat/utility/StreamRedirect.h

@@ -81 +81 @@
        Constructor for ostream
 
-       \a os1 is redirected to send its output to the buffer of \a os2
-       (rather than its own buffer). A reference to \a os1 and its
-       buffer is stored, so \a os1 can be restored in the destructor.
-
        If \a active is false, the class does nothing.
     */
@@ -112 +108 @@
     
     void init(std::basic_ios<charT, traits>& ios1, 
-              std::basic_ios<charT, traits>& ios2);
+              std::basic_ios<charT, traits>& ios2,
+              bool active);
     
     std::basic_streambuf<charT, traits>* buf_;
     std::basic_ifstream<charT, traits>* ifs_;
-    std::basic_istream<charT, traits>* is_;
+    std::basic_ios<charT, traits>* ios_;
     std::basic_ofstream<charT, traits>* ofs_;
-    std::basic_ostream<charT, traits>* os_;
   };
   
@@ -138 +134 @@
   BasicStreamRedirect(std::basic_istream<charT, traits>& is1, 
                       std::basic_istream<charT, traits>& is2, bool active)
-    : buf_(NULL), ifs_(NULL), is_(NULL), ofs_(NULL), os_(NULL) 
+    : buf_(NULL), ifs_(NULL), ios_(NULL), ofs_(NULL)
   {
-    if (active) {
-      is_ = &is1;
-      init(is1, is2);
-    }
+    init(is1, is2, active);
   }
   
@@ -151 +144 @@
   BasicStreamRedirect(std::basic_ostream<charT, traits>& os1, 
                       std::basic_ostream<charT, traits>& os2, bool active)
-    : buf_(NULL), ifs_(NULL), is_(NULL), ofs_(NULL), os_(NULL) 
+    : buf_(NULL), ifs_(NULL), ios_(NULL), ofs_(NULL)
   {
-    if (active) {
-      os_ = &os1;
-      init(os1, os2);
-    }
+    init(os1, os2, active);
   }
   
@@ -164 +154 @@
   BasicStreamRedirect(std::basic_ostream<charT, traits>& os1, 
                       const std::string& file, bool active)
-    : buf_(NULL), ifs_(NULL), is_(NULL), ofs_(NULL), os_(NULL) 
+    : buf_(NULL), ifs_(NULL), ios_(NULL), ofs_(NULL)
   {
     if (active) {
       ofs_ = new std::basic_ofstream<charT, traits>(file.c_str());
-      os_ = &os1;
-      init(os1, *ofs_);
+      init(os1, *ofs_, active);
     }
   }
@@ -178 +167 @@
   ~BasicStreamRedirect(void)
   {
-    YAT_ASSERT(os_==NULL || is_==NULL);
-
     // only restore stream if active is true
-    if (os_) {
-      std::flush(*os_);
-      os_->rdbuf(buf_);
-    }
-    else if (is_) {
-      is_->rdbuf(buf_);
+    if (ios_) {
+      ios_->rdbuf(buf_);
     }
     delete ifs_;
@@ -196 +179 @@
   void 
   BasicStreamRedirect<charT, traits>::init(std::basic_ios<charT, traits>& s1, 
-                                           std::basic_ios<charT, traits>& s2)
+                                           std::basic_ios<charT, traits>& s2,
+                                           bool active)
   {
-    // save the buffer 
-    buf_ = s1.rdbuf();
-    // redirect os1 to os2
-    s1.rdbuf(s2.rdbuf());
+    if (active) {
+      ios_ = &s1;
+      // save the buffer 
+      buf_ = s1.rdbuf();
+      // redirect os1 to os2
+      s1.rdbuf(s2.rdbuf());
+    }
   }