aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/diagnostics.cxx17
-rw-r--r--mod/diagnostics.hxx50
-rw-r--r--web/apache/service.hxx3
3 files changed, 44 insertions, 26 deletions
diff --git a/mod/diagnostics.cxx b/mod/diagnostics.cxx
index 07fd86c..601ecab 100644
--- a/mod/diagnostics.cxx
+++ b/mod/diagnostics.cxx
@@ -5,6 +5,7 @@
#include <mod/diagnostics.hxx>
using namespace std;
+using namespace butl;
namespace brep
{
@@ -12,14 +13,18 @@ namespace brep
~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.
+ // the stack unwinding.
+ //
+#ifdef __cpp_lib_uncaught_exceptions
+ if (!data_.empty () && uncaught_ == uncaught_exceptions ())
+#else
+ // Fallback implementation. Right now this means we cannot use this
+ // mechanism in destructors, which is not a big deal, except for one
+ // place: exception_guard. Thus the ugly special check.
//
if (!data_.empty () &&
- (!uncaught_exception () /*|| exception_unwinding_dtor*/))
+ (!uncaught_exception () || exception_unwinding_dtor ()))
+#endif
{
data_.back ().msg = os_.str (); // Save last message.
diff --git a/mod/diagnostics.hxx b/mod/diagnostics.hxx
index cc3eef6..d30a5ef 100644
--- a/mod/diagnostics.hxx
+++ b/mod/diagnostics.hxx
@@ -6,6 +6,9 @@
#define MOD_DIAGNOSTICS_HXX
#include <sstream>
+#include <exception> // uncaught_exception[s]()
+
+#include <libbutl/ft/exception.hxx> // uncaught_exceptions
#include <libbrep/types.hxx>
#include <libbrep/utility.hxx>
@@ -52,15 +55,20 @@ namespace brep
return r;
}
- diag_record () = default;
+ diag_record ()
+ :
+#ifdef __cpp_lib_uncaught_exceptions
+ uncaught_ (std::uncaught_exceptions ()),
+#endif
+ epilogue_ (nullptr) {}
template <typename B>
explicit
- diag_record (const diag_prologue<B>& p) {*this << p;} // See below.
+ diag_record (const diag_prologue<B>& p): diag_record () {*this << p;}
template <typename B>
explicit
- diag_record (const diag_mark<B>& m) {*this << m;} // See below.
+ diag_record (const diag_mark<B>& m): diag_record () {*this << m;}
~diag_record () noexcept(false);
@@ -88,25 +96,26 @@ namespace brep
// Move constructible-only type.
//
- /*
- @@ libstdc++ doesn't yet have the ostringstream move support.
-
+ // Older versions of libstdc++ don't have the ostringstream move support
+ // and accuratly detecting its version is non-trivial. So we always use
+ // the pessimized implementation with libstdc++. Luckily, GCC doesn't seem
+ // to be needing move due to copy/move elision.
+ //
+#ifdef __GLIBCXX__
+ diag_record (diag_record&&);
+#else
diag_record (diag_record&& r)
- : data_ (move (r.data_)), os_ (move (r.os_))
+ :
+#ifdef __cpp_lib_uncaught_exceptions
+ uncaught_ (r.uncaught_),
+#endif
+ data_ (move (r.data_)),
+ os_ (move (r.os_)),
+ epilogue_ (r.epilogue_)
{
- epilogue_ = r.epilogue_;
- r.data_.clear (); // Empty.
- }
- */
-
- diag_record (diag_record&& r): data_ (move (r.data_))
- {
- if (!data_.empty ())
- os_ << r.os_.str ();
-
- epilogue_ = r.epilogue_;
r.data_.clear (); // Empty.
}
+#endif
diag_record& operator= (diag_record&&) = delete;
@@ -114,9 +123,12 @@ namespace brep
diag_record& operator= (const diag_record&) = delete;
private:
+#ifdef __cpp_lib_uncaught_exceptions
+ const int uncaught_;
+#endif
mutable diag_data data_;
mutable std::ostringstream os_;
- mutable const diag_epilogue* epilogue_ {nullptr};
+ mutable const diag_epilogue* epilogue_;
};
// Base (B) should provide operator() that configures diag_record.
diff --git a/web/apache/service.hxx b/web/apache/service.hxx
index 28c789e..f5155ef 100644
--- a/web/apache/service.hxx
+++ b/web/apache/service.hxx
@@ -55,7 +55,8 @@ namespace web
nullptr,
nullptr,
nullptr,
- &register_hooks<M>
+ &register_hooks<M>,
+ AP_MODULE_FLAG_NONE
},
name_ (name),
exemplar_ (exemplar)