From d093d3d5d47519a2887ab6e0f0b1c7954fa59e73 Mon Sep 17 00:00:00 2001 From: Stephan Hageboeck Date: Thu, 23 Apr 2026 10:33:01 +0200 Subject: [PATCH 1/2] [core] Clean up the deprecation macros, remove the one for v6.40. --- core/foundation/inc/ROOT/RConfig.hxx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/foundation/inc/ROOT/RConfig.hxx b/core/foundation/inc/ROOT/RConfig.hxx index 550bb7a366bfd..50c119b1c84ae 100644 --- a/core/foundation/inc/ROOT/RConfig.hxx +++ b/core/foundation/inc/ROOT/RConfig.hxx @@ -477,14 +477,8 @@ #define _R_DEPRECATED_REMOVE_NOW(REASON) __attribute__((REMOVE_THIS_NOW)) #endif -/* USE AS `R__DEPRECATED(6,40, "Not threadsafe; use TFoo::Bar().")` - To be removed by 6.40 */ -#if ROOT_VERSION_CODE <= ROOT_VERSION(6, 39, 0) -#define _R__DEPRECATED_640(REASON) _R__DEPRECATED_LATER(REASON) -#else -#define _R__DEPRECATED_640(REASON) _R_DEPRECATED_REMOVE_NOW(REASON) -#endif - +/* USE AS `R__DEPRECATED(6,42, "Not threadsafe; use TFoo::Bar().")` + To be removed by 6.42 */ #if ROOT_VERSION_CODE <= ROOT_VERSION(6, 41, 0) #define _R__DEPRECATED_642(REASON) _R__DEPRECATED_LATER(REASON) #else From 63582a55ac72fbb8680bf447e9b9833fb92fbe58 Mon Sep 17 00:00:00 2001 From: Stephan Hageboeck Date: Thu, 23 Apr 2026 10:54:31 +0200 Subject: [PATCH 2/2] Update ROOT version files to v6.41.01 --- core/foundation/inc/ROOT/RVersion.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/foundation/inc/ROOT/RVersion.hxx b/core/foundation/inc/ROOT/RVersion.hxx index fdb4319c069b5..2f23b7c43bf71 100644 --- a/core/foundation/inc/ROOT/RVersion.hxx +++ b/core/foundation/inc/ROOT/RVersion.hxx @@ -3,8 +3,8 @@ /* Update on release: */ #define ROOT_VERSION_MAJOR 6 -#define ROOT_VERSION_MINOR 39 -#define ROOT_VERSION_PATCH 99 // When changing the version number here, never add leading zeroes! +#define ROOT_VERSION_MINOR 41 +#define ROOT_VERSION_PATCH 1 // When changing the version number here, never add leading zeroes! #define ROOT_RELEASE_DATE "Apr 23 2026" /* Don't change the lines below. */