aboutsummaryrefslogtreecommitdiff
path: root/build2/types
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-11-22 12:10:03 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-22 12:10:03 +0200
commit557269660c1d9796a7cf9e911efb9262f645e359 (patch)
tree0323bcb5a90c339fe87fcd193cf71bdcb3431c91 /build2/types
parentfae6cd2235c907e077dad7b5d8dc9b6d90a78a37 (diff)
Use diagnostics facility from libbutl
Diffstat (limited to 'build2/types')
-rw-r--r--build2/types25
1 files changed, 17 insertions, 8 deletions
diff --git a/build2/types b/build2/types
index b4488bb..c73da73 100644
--- a/build2/types
+++ b/build2/types
@@ -112,11 +112,6 @@ namespace build2
using paths = std::vector<path>;
using dir_paths = std::vector<dir_path>;
- // Path printing with trailing slash for directories (utility.cxx).
- //
- ostream&
- operator<< (ostream&, const path&);
-
// <butl/timestamp>
//
using butl::system_clock;
@@ -137,14 +132,28 @@ namespace build2
using butl::process_path;
using butl::process_error;
- ostream&
- operator<< (ostream&, const process_path&); // Print as recall[@effect].
-
using butl::auto_fd;
using butl::ifdstream;
using butl::ofdstream;
}
+// In order to be found (via ADL) these have to be either in std:: or in
+// butl::. The latter is bad idea since libbutl includes the default
+// implementation. They are defined in utility.cxx.
+//
+namespace std
+{
+ // Path printing with trailing slash for directories.
+ //
+ ostream&
+ operator<< (ostream&, const ::butl::path&);
+
+ // Print as recall[@effect].
+ //
+ ostream&
+ operator<< (ostream&, const ::butl::process_path&);
+}
+
// <build2/name>
//
#include <build2/name>