diff --git a/src/util/debug.cpp b/src/util/debug.cpp index 029fae921d87e0e37ddde3fa33a60c08d2fb06ef..4aa5d69a2f6880b3cffce5121f611a5ee79ded70 100644 --- a/src/util/debug.cpp +++ b/src/util/debug.cpp @@ -3,7 +3,7 @@ #include <cstring> #include <iomanip> #include <iostream> -#include <thread> +#include <mutex> #include "util/debug.hpp" #include "util/ioutil.hpp" @@ -16,8 +16,8 @@ namespace util { std::mutex global_debug_cerr_mutex; #endif -bool failed_assertion(const char *assertion, const char *file, - int line, const char *func) +bool failed_assertion(const char* assertion, const char* file, + int line, const char* func) { // Explicit flush, as we can't assume default buffering semantics on stderr/cerr, // and abort() might not flush streams. @@ -28,7 +28,9 @@ bool failed_assertion(const char *assertion, const char *file, return false; } -std::ostream& debug_emit_trace_leader(std::ostream &out, const char* file, int line, const char* varlist) { +std::ostream& debug_emit_trace_leader(std::ostream& out, const char* file, + int line, const char* varlist) +{ iosfmt_guard _(out); const char* leaf = std::strrchr(file, '/'); diff --git a/src/util/debug.hpp b/src/util/debug.hpp index 6739c4ff1e727b4e04a7cc734c3c30a92f840c98..e7fd32cb9c144fb7ec73aa569dcb5e07006b0a92 100644 --- a/src/util/debug.hpp +++ b/src/util/debug.hpp @@ -29,7 +29,7 @@ extern std::mutex global_debug_cerr_mutex; #endif template <typename... Args> -void debug_emit_trace(const char *file, int line, const char *varlist, const Args&... args) { +void debug_emit_trace(const char* file, int line, const char* varlist, const Args&... args) { #ifdef WITH_TBB std::stringstream out; #else diff --git a/src/util/ioutil.hpp b/src/util/ioutil.hpp index b6670072b4529258c52d59b023e71d5313905c9b..f180115037a89c7b617a8831b336b7a60a5e8472 100644 --- a/src/util/ioutil.hpp +++ b/src/util/ioutil.hpp @@ -8,7 +8,7 @@ namespace util { class iosfmt_guard { public: - explicit iosfmt_guard(std::ios &stream): save_(nullptr), stream_(stream) { + explicit iosfmt_guard(std::ios& stream) : save_(nullptr), stream_(stream) { save_.copyfmt(stream_); }