From 8749eeea8723196fa38a9eb7917775cfe8b87ad7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 22 Nov 2016 12:09:27 +0200 Subject: Use diagnostics facility from libbutl --- bpkg/diagnostics.cxx | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) (limited to 'bpkg/diagnostics.cxx') diff --git a/bpkg/diagnostics.cxx b/bpkg/diagnostics.cxx index 9d1f96d..82ebb8c 100644 --- a/bpkg/diagnostics.cxx +++ b/bpkg/diagnostics.cxx @@ -48,29 +48,6 @@ namespace bpkg // uint16_t verb; - // Diagnostic facility, base infrastructure. - // - ostream* diag_stream = &cerr; - - diag_record:: - ~diag_record () noexcept(false) - { - // Don't flush the record if this destructor was called as part of - // the stack unwinding. Right now this means we cannot use this - // mechanism in destructors, which is not a big deal, except for - // one place: exception_guard. So for now we are going to have - // this ugly special check which we will be able to get rid of - // once C++17 uncaught_exceptions() becomes available. - // - if (!empty_ && (!uncaught_exception () || exception_unwinding_dtor)) - { - *diag_stream << os_.str () << endl; - - if (epilogue_ != nullptr) - epilogue_ (*this); // Can throw. - } - } - // Diagnostic facility, project specifics. // @@ -120,8 +97,9 @@ namespace bpkg } const basic_mark error ("error"); - const basic_mark warn ("warning"); - const basic_mark info ("info"); - const basic_mark text (nullptr); - const fail_mark fail; + const basic_mark warn ("warning"); + const basic_mark info ("info"); + const basic_mark text (nullptr); + const fail_mark fail ("error"); + const fail_end endf; } -- cgit v1.1