Address compliance issues with coding guidelines.

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, '/');

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

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_);
     }