From 96f85239a37b45c6a61a61adbcd7ed51673cee3f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 3 Nov 2016 17:51:40 +0200
Subject: Adjust diag_record::os_ member name to os

---
 build2/diagnostics     | 12 ++++++------
 build2/diagnostics.cxx |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'build2')

diff --git a/build2/diagnostics b/build2/diagnostics
index 091b313..6b89903 100644
--- a/build2/diagnostics
+++ b/build2/diagnostics
@@ -124,7 +124,7 @@ namespace build2
     friend const diag_record&
     operator<< (const diag_record& r, const T& x)
     {
-      r.os_ << x;
+      r.os << x;
       return r;
     }
 
@@ -154,7 +154,7 @@ namespace build2
       if (empty_)
         empty_ = false;
       else
-        os_ << "\n  ";
+        os << "\n  ";
     }
 
     // Move constructible-only type.
@@ -166,7 +166,7 @@ namespace build2
     //
     diag_record (diag_record&& r)
 #ifndef __GLIBCXX__
-        : os_ (move (r.os_))
+        : os (move (r.os))
 #endif
     {
       empty_ = r.empty_;
@@ -175,8 +175,8 @@ namespace build2
       if (!empty_)
       {
 #ifdef __GLIBCXX__
-        stream_verb (os_, stream_verb (r.os_));
-        os_ << r.os_.str ();
+        stream_verb (os, stream_verb (r.os));
+        os << r.os.str ();
 #endif
         r.empty_ = true;
         r.epilogue_ = nullptr;
@@ -189,7 +189,7 @@ namespace build2
     diag_record& operator= (const diag_record&) = delete;
 
   public:
-    mutable std::ostringstream os_;
+    mutable std::ostringstream os;
 
   private:
     mutable bool empty_;
diff --git a/build2/diagnostics.cxx b/build2/diagnostics.cxx
index 945632a..dfd792e 100644
--- a/build2/diagnostics.cxx
+++ b/build2/diagnostics.cxx
@@ -61,7 +61,7 @@ namespace build2
     //
     if (!empty_ && (!std::uncaught_exception () || exception_unwinding_dtor))
     {
-      *diag_stream << os_.str () << endl;
+      *diag_stream << os.str () << endl;
 
       if (epilogue_ != nullptr)
         epilogue_ (*this); // Can throw.
@@ -74,7 +74,7 @@ namespace build2
   void simple_prologue_base::
   operator() (const diag_record& r) const
   {
-    stream_verb (r.os_, sverb_);
+    stream_verb (r.os, sverb_);
 
     if (type_ != nullptr)
       r << type_ << ": ";
@@ -89,7 +89,7 @@ namespace build2
   void location_prologue_base::
   operator() (const diag_record& r) const
   {
-    stream_verb (r.os_, sverb_);
+    stream_verb (r.os, sverb_);
 
     r << *loc_.file << ':';
 
-- 
cgit v1.1