Changeset 20096 for trunk/Mars/mbase

Timestamp:

05/07/21 12:37:39 (4 years ago)

Author:

tbretz

Message:

root 6.24 requires some more includes, clasng 10 is a bit more picky about overload warinings and casting, gErrorMutex i deprecated -> so we can only lock our error handler again ourselves... well... mess ahead... thank you.

File:

• trunk/Mars/mbase/MLog.cc (modified) (4 diffs)

trunk/Mars/mbase/MLog.cc

@@ -99 +99 @@
 #include <iomanip>
 
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,24,00)
+#include <mutex>
+#endif
+
+
 #include <TROOT.h>      // gROOT->GetListOfCleanups()
 #include <TSystem.h>
@@ -150 +155 @@
 MLog gLog;
 
+/// Serializes error output, destructed by the gROOT destructor via ReleaseDefaultErrorHandler()
+ static std::mutex *GetErrorMutex() {
+    static std::mutex *m = new std::mutex();
+    return m;
+ }
+ 
 // --------------------------------------------------------------------------
 //
@@ -760 +771 @@
     // if abort is set it aborts the application.
    if (gErrorIgnoreLevel == kUnset) {
-      R__LOCKGUARD2(gErrorMutex);
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,24,00)
+       R__LOCKGUARD2(gErrorMutex);
+#else
+       std::lock_guard<std::mutex> guard(*GetErrorMutex());
+#endif
 
       gErrorIgnoreLevel = 0;
@@ -789 +804 @@
 void MLog::ErrorHandlerPrint(Int_t level, const char *location, const char *msg)
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,24,00)
     R__LOCKGUARD2(gErrorMutex);
+#else
+    std::lock_guard<std::mutex> guard(*GetErrorMutex());
+#endif
 
     if (level >= kError)