From 24f74ea70a19ccd7bcb489853fc73a972ab8638f Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 27 Jul 2017 02:30:09 +0300
Subject: Fix to print to diagnostics stream instead of std::cerr

---
 build2/cc/compile.cxx | 14 ++++++--------
 build2/cc/link.cxx    |  7 +++----
 build2/cc/msvc.cxx    |  6 ++----
 3 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'build2/cc')

diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index b65cee7..805ad82 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -5,8 +5,6 @@
 #include <build2/cc/compile.hxx>
 
 #include <cstdlib>  // exit()
-#include <iostream> // cerr
-
 #include <build2/depdb.hxx>
 #include <build2/scope.hxx>
 #include <build2/context.hxx>
@@ -2240,13 +2238,13 @@ namespace build2
               // we need to copy the diagnostics for the user to see.
               //
               // Note that the eof check is important: if the stream is at
-              // eof, this and all subsequent writes to cerr will fail (and
-              // you won't see a thing).
+              // eof, this and all subsequent writes to the diagnostics stream
+              // will fail (and you won't see a thing).
               //
               if (bad_error                                 &&
                   cid == compiler_id::msvc                  &&
                   is.peek () != ifdstream::traits_type::eof ())
-                cerr << is.rdbuf ();
+                diag_stream_lock () << is.rdbuf ();
 
               is.close ();
 
@@ -3721,11 +3719,11 @@ namespace build2
 
             // If anything remains in the stream, send it all to stderr. Note
             // that the eof check is important: if the stream is at eof, this
-            // and all subsequent writes to cerr will fail (and you won't see
-            // a thing).
+            // and all subsequent writes to the diagnostics stream will fail
+            // (and you won't see a thing).
             //
             if (is.peek () != ifdstream::traits_type::eof ())
-              cerr << is.rdbuf ();
+              diag_stream_lock () << is.rdbuf ();
 
             is.close ();
           }
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index a91fa1e..b113adb 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -6,7 +6,6 @@
 
 #include <map>
 #include <cstdlib>  // exit()
-#include <iostream> // cerr
 
 #include <libbutl/path-map.hxx>
 #include <libbutl/filesystem.hxx> // file_exists()
@@ -1713,11 +1712,11 @@ namespace build2
 
             // If anything remains in the stream, send it all to stderr. Note
             // that the eof check is important: if the stream is at eof, this
-            // and all subsequent writes to cerr will fail (and you won't see
-            // a thing).
+            // and all subsequent writes to the diagnostics stream will fail
+            // (and you won't see a thing).
             //
             if (is.peek () != ifdstream::traits_type::eof ())
-              cerr << is.rdbuf ();
+              diag_stream_lock () << is.rdbuf ();
 
             is.close ();
           }
diff --git a/build2/cc/msvc.cxx b/build2/cc/msvc.cxx
index b00b8a9..993065d 100644
--- a/build2/cc/msvc.cxx
+++ b/build2/cc/msvc.cxx
@@ -2,8 +2,6 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <iostream> // cerr
-
 #include <build2/scope.hxx>
 #include <build2/target.hxx>
 #include <build2/context.hxx>
@@ -54,7 +52,7 @@ namespace build2
       //
       string l;
       if (getline (is, l) && l != src.leaf ().string ())
-        cerr << l << endl;
+        diag_stream_lock () << l << endl;
     }
 
     void
@@ -80,7 +78,7 @@ namespace build2
         // can't quite reproduce it.
         //
 
-        cerr << l << endl;
+        diag_stream_lock () << l << endl;
         break;
       }
     }
-- 
cgit v1.1