[core] Update version files and clean up APIs marked for removal. #22023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

hageboeck wants to merge 2 commits into root-project:master from hageboeck:deprecation_macros_6.40

+4 −10

core/foundation/inc/ROOT/RConfig.hxx

-Original file line number
+Diff line change
@@ Expand Up / @@ -474,17 +474,11 @@ @@
     #ifdef R__WIN32
     #define _R_DEPRECATED_REMOVE_NOW(REASON)
     #else
     #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
@@ Expand Down @@

core/foundation/inc/ROOT/RVersion.hxx

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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. */

[core] Update version files and clean up APIs marked for removal. #22023

Are you sure you want to change the base?

[core] Update version files and clean up APIs marked for removal. #22023

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

GitHub Actions / debian13 dev=ON, CMAKE_CXX_FLAGS=-Wsuggest-override

GitHub Actions / debian13 dev=ON, CMAKE_CXX_FLAGS=-Wsuggest-override

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 benchmark build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / alma10 minimal build CMAKE_CXX_STANDARD=20

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / opensuse15 march_native

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / rawhide Fedora pydebug CMAKE_CXX_STANDARD=23

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma8

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / alma9 modules_off CMAKE_CXX_STANDARD=20

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / ubuntu2604

GitHub Actions / fedora43

GitHub Actions / fedora43

GitHub Actions / fedora43

GitHub Actions / fedora43

GitHub Actions / fedora43

GitHub Actions / fedora43