aboutsummaryrefslogtreecommitdiff
path: root/build2/context.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-01-23 11:14:05 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-01-23 11:14:05 +0200
commitdb0edaafe15831ba6fa9c2109da37942506c62b1 (patch)
tree320dfcbf16b553c162cd079d633f16b6054b9740 /build2/context.cxx
parent19c37866524f60a7710b256dd13bf1da9f8cff16 (diff)
Cleanup absolute/relative path diagnostics by introducing stream verbosity
Diffstat (limited to 'build2/context.cxx')
-rw-r--r--build2/context.cxx25
1 files changed, 6 insertions, 19 deletions
diff --git a/build2/context.cxx b/build2/context.cxx
index 0579545..87a6d71 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -5,7 +5,6 @@
#include <build2/context>
#include <ostream>
-#include <sstream>
#include <cassert>
#include <system_error>
@@ -22,7 +21,6 @@ namespace build2
dir_path work;
dir_path home;
- string_pool path_pool;
string_pool extension_pool;
string_pool project_name_pool;
@@ -35,7 +33,6 @@ namespace build2
void
reset ()
{
- path_pool.clear ();
extension_pool.clear ();
project_name_pool.clear ();
@@ -299,15 +296,13 @@ namespace build2
// diag_do(), etc.
//
- string
- diag_do (const action&, const target& t)
+ void
+ diag_do (ostream& os, const action&, const target& t)
{
const meta_operation_info& m (*current_mif);
const operation_info& io (*current_inner_oif);
const operation_info* oo (current_outer_oif);
- ostringstream os;
-
// perform(update(x)) -> "update x"
// configure(update(x)) -> "configure updating x"
//
@@ -325,18 +320,15 @@ namespace build2
os << "(for " << oo->name << ") ";
os << t;
- return os.str ();
}
- string
- diag_doing (const action&, const target& t)
+ void
+ diag_doing (ostream& os, const action&, const target& t)
{
const meta_operation_info& m (*current_mif);
const operation_info& io (*current_inner_oif);
const operation_info* oo (current_outer_oif);
- ostringstream os;
-
// perform(update(x)) -> "updating x"
// configure(update(x)) -> "configuring updating x"
//
@@ -350,18 +342,15 @@ namespace build2
os << "(for " << oo->name << ") ";
os << t;
- return os.str ();
}
- string
- diag_done (const action&, const target& t)
+ void
+ diag_done (ostream& os, const action&, const target& t)
{
const meta_operation_info& m (*current_mif);
const operation_info& io (*current_inner_oif);
const operation_info* oo (current_outer_oif);
- ostringstream os;
-
// perform(update(x)) -> "x is up to date"
// configure(update(x)) -> "updating x is configured"
//
@@ -385,7 +374,5 @@ namespace build2
os << t << " " << m.name_done;
}
-
- return os.str ();
}
}