From 8cca7abfa75ad23337e74e01e83012173fe183e9 Mon Sep 17 00:00:00 2001 From: Ron Rechenmacher Date: Thu, 7 May 2026 00:00:11 -0500 Subject: [PATCH 1/3] when __CUDA_ARCH__, _cplusplus version number not defined --- include/TRACE/trace.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/include/TRACE/trace.h b/include/TRACE/trace.h index 085f54951..f342ee7f3 100644 --- a/include/TRACE/trace.h +++ b/include/TRACE/trace.h @@ -8,7 +8,7 @@ #define TRACE_H #if !defined(__CUDA_ARCH__) && !defined(__ROOTCLING__) /* Allow inclusion into CUDA file (including .cu files) and ROOT parse */ -# define TRACE_REV "$Revision: 1739 $$Date: 2026-03-17 13:52:01 -0500 (Tue, 17 Mar 2026) $" +# define TRACE_REV "$Revision: 1742 $$Date: 2026-05-06 23:58:50 -0500 (Wed, 06 May 2026) $" // The C++ streamer style macros............................................... /* @@ -331,7 +331,7 @@ enum tlvle_t { TRACE_LVL_ENUM_0_9, TRACE_LVL_ENUM_10_63 }; # endif // clang-format off -#define TRACE_REVx $_$Revision: 1739 $_$Date: 2026-03-17 13:52:01 -0500 (Tue, 17 Mar 2026) $ +#define TRACE_REVx $_$Revision: 1742 $_$Date: 2026-05-06 23:58:50 -0500 (Wed, 06 May 2026) $ // Who would ever have an identifier/token that begins with $_$??? #define $_$Revision 0?0 #define $_$Date , @@ -4933,10 +4933,8 @@ TraceGuard operator+(TraceGuardOnExit, Fun &&fn) if (0) std::cout # define TLOG_ARB(...) \ if (0) std::cout -# if _cplusplus >= 201703L -# define TLOG_ENTEX(...) \ - if (0) std::cout -# endif +# define TLOG_ENTEX(...) \ + if (0) std::cout # endif /* __cplusplus */ # define TRACE(...) # define TRACEN(...) From 498b18f23357bd24296cced6238014d9027bd15a Mon Sep 17 00:00:00 2001 From: Ron Rechenmacher Date: Thu, 7 May 2026 00:36:25 -0500 Subject: [PATCH 2/3] need <<"" for no warnings --- include/TRACE/trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/TRACE/trace.h b/include/TRACE/trace.h index f342ee7f3..62f6976d1 100644 --- a/include/TRACE/trace.h +++ b/include/TRACE/trace.h @@ -8,7 +8,7 @@ #define TRACE_H #if !defined(__CUDA_ARCH__) && !defined(__ROOTCLING__) /* Allow inclusion into CUDA file (including .cu files) and ROOT parse */ -# define TRACE_REV "$Revision: 1742 $$Date: 2026-05-06 23:58:50 -0500 (Wed, 06 May 2026) $" +# define TRACE_REV "$Revision: 1743 $$Date: 2026-05-07 00:35:48 -0500 (Thu, 07 May 2026) $" // The C++ streamer style macros............................................... /* @@ -331,7 +331,7 @@ enum tlvle_t { TRACE_LVL_ENUM_0_9, TRACE_LVL_ENUM_10_63 }; # endif // clang-format off -#define TRACE_REVx $_$Revision: 1742 $_$Date: 2026-05-06 23:58:50 -0500 (Wed, 06 May 2026) $ +#define TRACE_REVx $_$Revision: 1743 $_$Date: 2026-05-07 00:35:48 -0500 (Thu, 07 May 2026) $ // Who would ever have an identifier/token that begins with $_$??? #define $_$Revision 0?0 #define $_$Date , @@ -4934,7 +4934,7 @@ TraceGuard operator+(TraceGuardOnExit, Fun &&fn) # define TLOG_ARB(...) \ if (0) std::cout # define TLOG_ENTEX(...) \ - if (0) std::cout + if (0) std::cout<<"" # endif /* __cplusplus */ # define TRACE(...) # define TRACEN(...) From c18bd41e3e18d1f9930fc7a98aaa6c99c51ae8bd Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Thu, 7 May 2026 07:28:02 -0500 Subject: [PATCH 3/3] Clang-format --- include/TRACE/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/TRACE/trace.h b/include/TRACE/trace.h index 62f6976d1..a3fc24b0c 100644 --- a/include/TRACE/trace.h +++ b/include/TRACE/trace.h @@ -4934,7 +4934,7 @@ TraceGuard operator+(TraceGuardOnExit, Fun &&fn) # define TLOG_ARB(...) \ if (0) std::cout # define TLOG_ENTEX(...) \ - if (0) std::cout<<"" + if (0) std::cout << "" # endif /* __cplusplus */ # define TRACE(...) # define TRACEN(...)