Fixes for CI

JeffersonLab · Dec 14, 2024 · 6097b10 · 6097b10
1 parent 1cd40ad
commit 6097b10
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/libraries/JANA/Compatibility/jerror.h b/src/libraries/JANA/Compatibility/jerror.h
@@ -8,9 +8,6 @@
 
 #pragma once
 
-#define _DBG_ std::cerr<<__FILE__<<":"<<__LINE__<<" "
-#define _DBG__ std::cerr<<__FILE__<<":"<<__LINE__<<std::endl
-
 enum jerror_t{
     NOERROR = 0,
     UNKNOWN_ERROR = -1000,

diff --git a/src/libraries/JANA/JLogger.h b/src/libraries/JANA/JLogger.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <JANA/Compatibility/JStreamLog.h>
+
 #include <iostream>
 #include <sstream>
 #include <chrono>
@@ -123,6 +125,12 @@ JLogMessage operator<<(const JLogger& logger, T&& t) {
     return message;
 }
 
+inline JLogMessage operator<<(const JLogger& logger, std::ostream& (*manip)(std::ostream&)) {
+    JLogMessage message(logger, logger.level);
+    message << manip;
+    return message;
+}
+
 
 /// Macros
 
@@ -147,8 +155,8 @@ JLogMessage operator<<(const JLogger& logger, T&& t) {
 extern JLogger jout;
 extern JLogger jerr;
 #define jendl std::endl
-#define default_cout_logger jout;
-#define default_cerr_logger jerr;
+#define default_cout_logger jout
+#define default_cerr_logger jerr
 #define _DBG_ jerr<<__FILE__<<":"<<__LINE__<<" "
 #define _DBG__ jerr<<__FILE__<<":"<<__LINE__<<std::endl
 
diff --git a/src/programs/unit_tests/Utils/JLoggerTests.cc b/src/programs/unit_tests/Utils/JLoggerTests.cc
@@ -69,7 +69,8 @@ TEST_CASE("JLogMessage_StreamIntoLogger") {
     JLogger logger {JLogger::Level::ERROR, &std::cout, "jana"};
     logger.ShowGroup(true);
     logger << "This is a test. x = " << 22 << std::endl;
-    logger << "This should be the next line" << std::endl << "And another" << std::endl << "And another";
+    logger << "This should be the next line" << std::endl << "And another" << std::endl;
+    logger << std::endl << "There should be a blank line above this";
 }