From d169972622fa68a900433351dfd43f12576586a8 Mon Sep 17 00:00:00 2001 From: Stephan Hageboeck Date: Tue, 27 Oct 2026 16:07:27 +0100 Subject: [PATCH 1/2] Unify deprecation/removal message and timeline for installed headers. This adapts the header cleanup campaign to the request of leaving deprecations visible for more than one year. Not removing the headers in/after 6.44 opens a path for escalating the warnings to #error for the first releases of ROOT 7. --- builtins/csg/inc/CsgOps.h | 2 +- core/base/inc/Bswapcpy.h | 2 +- core/base/inc/Gtypes.h | 2 +- core/base/inc/Htypes.h | 2 +- core/base/inc/Riostream.h | 2 +- core/base/inc/Rpair.h | 2 +- core/base/inc/Strlen.h | 2 +- core/base/inc/Varargs.h | 2 +- core/foundation/inc/RStringView.h | 2 +- core/foundation/inc/Rstrstream.h | 2 +- core/lz4/inc/ZipLZ4.h | 2 +- core/lzma/inc/ZipLZMA.h | 2 +- core/thread/inc/PosixThreadInc.h | 2 +- core/zstd/inc/ZipZSTD.h | 2 +- hist/histpainter/inc/Hoption.h | 2 +- hist/histpainter/inc/Hparam.h | 2 +- math/mathcore/inc/VectorizedTMath.h | 2 +- montecarlo/eg/inc/Hepevt.h | 2 +- montecarlo/eg/inc/cfortran.h | 2 +- net/net/inc/NetErrors.h | 2 +- roofit/histfactory/inc/RooStats/HistFactory/Asimov.h | 2 +- roofit/histfactory/inc/RooStats/HistFactory/Channel.h | 2 +- roofit/histfactory/inc/RooStats/HistFactory/Systematics.h | 2 +- tree/tree/inc/TreeUtils.h | 2 +- tree/treeviewer/inc/HelpTextTV.h | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/builtins/csg/inc/CsgOps.h b/builtins/csg/inc/CsgOps.h index 3c85ca2cdcdda..49605c9cb2a0c 100644 --- a/builtins/csg/inc/CsgOps.h +++ b/builtins/csg/inc/CsgOps.h @@ -5,7 +5,7 @@ #define ROOT_CsgOps #if !defined(ROOT_CsgOps_cxx) && !defined(G__DICTIONARY) && !defined(__ROOTCLING__) && !defined(__CLING__) -#warning "This header and the TBaseMesh class are deprecated and will be removed after ROOT 6.44, together with the RCsg target. Use instead the 'TGeoTessellated' public interface. If that public interface doesn't provide what you need, contact the ROOT team to request its extension" +#warning "This header and the TBaseMesh class are deprecated and will be removed in ROOT 7, together with the RCsg target. Use instead the 'TGeoTessellated' public interface. If that public interface doesn't provide what you need, contact the ROOT team to request its extension" #endif #include "RtypesCore.h" diff --git a/core/base/inc/Bswapcpy.h b/core/base/inc/Bswapcpy.h index 80f0240e754ad..99732033093c6 100644 --- a/core/base/inc/Bswapcpy.h +++ b/core/base/inc/Bswapcpy.h @@ -11,7 +11,7 @@ #define ROOT_Bswapcpy #ifndef USE_BSWAPCPY -#warning "This header is an implementation detail of TBufferFile on Unix i386 GNUC, and is deprecated and will no longer be public after ROOT 6.44" +#warning "This header is deprecated and will be removed in ROOT 7" #endif diff --git a/core/base/inc/Gtypes.h b/core/base/inc/Gtypes.h index 7d877a58937ac..005987a15f405 100644 --- a/core/base/inc/Gtypes.h +++ b/core/base/inc/Gtypes.h @@ -21,7 +21,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#warning "The header Gtypes.h is deprecated and will be removed in ROOT 6.44, include instead Rtypes.h" +#warning "This header is deprecated and will be removed after ROOT 7. Include instead Rtypes.h" #include "Rtypes.h" diff --git a/core/base/inc/Htypes.h b/core/base/inc/Htypes.h index 8de4114437efe..feef9b5e82a3d 100644 --- a/core/base/inc/Htypes.h +++ b/core/base/inc/Htypes.h @@ -21,7 +21,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#warning "The header Htypes.h is deprecated and will be removed in ROOT 6.44, include instead Rtypes.h" +#warning "This header is deprecated and will be removed after ROOT 7. Include instead Rtypes.h" #include "Rtypes.h" diff --git a/core/base/inc/Riostream.h b/core/base/inc/Riostream.h index cbf2722e39fb4..0142927cd3123 100644 --- a/core/base/inc/Riostream.h +++ b/core/base/inc/Riostream.h @@ -12,7 +12,7 @@ #ifndef ROOT_Riostream #define ROOT_Riostream -#warning "This header is deprecated and will be removed after ROOT 6.44, use instead , or ." +#warning "This header is deprecated and will be removed after ROOT 7. Use instead , or ." ////////////////////////////////////////////////////////////////////////// // // diff --git a/core/base/inc/Rpair.h b/core/base/inc/Rpair.h index c4c1ef288a1e7..38736a36e054b 100644 --- a/core/base/inc/Rpair.h +++ b/core/base/inc/Rpair.h @@ -12,7 +12,7 @@ #ifndef ROOT_Rpair #define ROOT_Rpair -#warning "This header is obsolete and will be removed after 6.44, use instead " +#warning "This header is obsolete and will be removed in ROOT 7, use instead " // Include the definition of pairs #include diff --git a/core/base/inc/Strlen.h b/core/base/inc/Strlen.h index 3dd7344a97d06..c06bdd774d19e 100644 --- a/core/base/inc/Strlen.h +++ b/core/base/inc/Strlen.h @@ -11,7 +11,7 @@ #ifndef ROOT_Strlen #define ROOT_Strlen -#warning "This header is deprecated and will be removed in ROOT 6.44, use instead" +#warning "This header is deprecated and will be removed after ROOT 7. Use instead" #ifdef NEED_STRING #error "ROOT no longer provides implementation for strlen, NEED_STRING macro should not be defined." diff --git a/core/base/inc/Varargs.h b/core/base/inc/Varargs.h index ca71b9f3a6797..4ab6957e7ccde 100644 --- a/core/base/inc/Varargs.h +++ b/core/base/inc/Varargs.h @@ -11,7 +11,7 @@ #ifndef ROOT_Varargs #define ROOT_Varargs -#warning "The header Varargs.h is deprecated and will be removed in ROOT 6.46, include instead." +#warning "This header is deprecated and will be removed after ROOT 7. Include instead." #if defined(sparc) && defined(__CC_ATT301__) diff --git a/core/foundation/inc/RStringView.h b/core/foundation/inc/RStringView.h index e620b8c14b26c..8958ddcb0ac00 100644 --- a/core/foundation/inc/RStringView.h +++ b/core/foundation/inc/RStringView.h @@ -9,6 +9,6 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#warning "This header is deprecated and will be removed in ROOT 6.46, use ROOT/RStringView.hxx instead" +#warning "This header is deprecated and will be removed after ROOT 7. Use ROOT/RStringView.hxx instead" #include diff --git a/core/foundation/inc/Rstrstream.h b/core/foundation/inc/Rstrstream.h index 4cbd0d1cbed51..a5327b46ceffc 100644 --- a/core/foundation/inc/Rstrstream.h +++ b/core/foundation/inc/Rstrstream.h @@ -12,7 +12,7 @@ #ifndef ROOT_Rstrstream #define ROOT_Rstrstream -#warning "This header is deprecated and will be removed after ROOT 6.44, used instead " +#warning "This header is deprecated and will be removed after ROOT 7, used instead " #include diff --git a/core/lz4/inc/ZipLZ4.h b/core/lz4/inc/ZipLZ4.h index 475997c38a8fa..01b7d036f6d45 100644 --- a/core/lz4/inc/ZipLZ4.h +++ b/core/lz4/inc/ZipLZ4.h @@ -11,7 +11,7 @@ #ifndef ROOT_ZipLZ4 #define ROOT_ZipLZ4 -#warning "This header is deprecated and will be removed in 6.46, use instead methods within RZip.h" +#warning "This header is deprecated and will be removed after ROOT 7. Use instead methods within RZip.h" // NOTE: the ROOT compression libraries aren't consistently written in C++; hence the // #ifdef's to avoid problems with C code. diff --git a/core/lzma/inc/ZipLZMA.h b/core/lzma/inc/ZipLZMA.h index 7333a9720437a..611d59829fa03 100644 --- a/core/lzma/inc/ZipLZMA.h +++ b/core/lzma/inc/ZipLZMA.h @@ -12,7 +12,7 @@ #ifndef ROOT_ZipLZMA #define ROOT_ZipLZMA -#warning "This header is deprecated and will be removed in 6.46, use instead methods within RZip.h" +#warning "This header is deprecated and will be removed after ROOT 7. Use instead methods within RZip.h" #ifdef __cplusplus extern "C" { diff --git a/core/thread/inc/PosixThreadInc.h b/core/thread/inc/PosixThreadInc.h index 209120a611abc..b70e3c94d7b8a 100644 --- a/core/thread/inc/PosixThreadInc.h +++ b/core/thread/inc/PosixThreadInc.h @@ -11,7 +11,7 @@ #ifndef ROOT_PosixThreadInc #define ROOT_PosixThreadInc -#warning "This header is deprecated and will be removed after ROOT 6.44, use instead and " +#warning "This header is deprecated and will be removed after ROOT 7. Use instead and " ////////////////////////////////////////////////////////////////////////// // // diff --git a/core/zstd/inc/ZipZSTD.h b/core/zstd/inc/ZipZSTD.h index 71547b8ef6fc8..7db3d1c91e489 100644 --- a/core/zstd/inc/ZipZSTD.h +++ b/core/zstd/inc/ZipZSTD.h @@ -10,7 +10,7 @@ #ifndef ROOT_ZipZSTD #define ROOT_ZipZSTD -#warning "This header is deprecated and will be removed in 6.46, use instead methods within RZip.h" +#warning "This header is deprecated and will be removed after ROOT 7. Use instead methods within RZip.h" // NOTE: the ROOT compression libraries aren't consistently written in C++; hence the // #ifdef's to avoid problems with C code. diff --git a/hist/histpainter/inc/Hoption.h b/hist/histpainter/inc/Hoption.h index 91ab7b57a2265..374b63fa5482c 100644 --- a/hist/histpainter/inc/Hoption.h +++ b/hist/histpainter/inc/Hoption.h @@ -12,7 +12,7 @@ #define ROOT_Hoption #if !defined(ROOT_Hoption_cxx) && !defined(G__DICTIONARY) -#warning "This header is deprecated and will be removed in ROOT 6.44, use instead `THistPainter`, `TGraph2DPainter` public interfaces." +#warning "This header is deprecated and will be removed after ROOT 7. Use instead `THistPainter`, `TGraph2DPainter` public interfaces." #endif //////////////////////////////////////////////////////////////////////////////// diff --git a/hist/histpainter/inc/Hparam.h b/hist/histpainter/inc/Hparam.h index 6d23afd77f398..570b6553cbf82 100644 --- a/hist/histpainter/inc/Hparam.h +++ b/hist/histpainter/inc/Hparam.h @@ -25,7 +25,7 @@ Used internally by THistPainter to manage histogram parameters. #include "RtypesCore.h" #if !defined(ROOT_Hparam_cxx) && !defined(G__DICTIONARY) -#warning "This header is deprecated and will be removed in ROOT 6.44, use instead `THistPainter`, `TGraph2DPainter` public interfaces." +#warning "This header is deprecated and will be removed after ROOT 7. Use instead `THistPainter`, `TGraph2DPainter` public interfaces." #endif typedef struct Hparam_t { diff --git a/math/mathcore/inc/VectorizedTMath.h b/math/mathcore/inc/VectorizedTMath.h index 905336fddd5e5..c3d0ae052a26a 100644 --- a/math/mathcore/inc/VectorizedTMath.h +++ b/math/mathcore/inc/VectorizedTMath.h @@ -2,7 +2,7 @@ #define ROOT_VectorizedTMath #if !defined(G__DICTIONARY) && !defined(__ROOTCLING__) -#warning "This header is deprecated and will be removed in ROOT 6.44, use instead 'TMathVectorized.h'" +#warning "This header is deprecated and will be removed after ROOT 7. Use instead 'TMathVectorized.h'" #endif #include "TMathVectorized.h" diff --git a/montecarlo/eg/inc/Hepevt.h b/montecarlo/eg/inc/Hepevt.h index 7d1258ee6ad47..fb0d7d865e7bb 100644 --- a/montecarlo/eg/inc/Hepevt.h +++ b/montecarlo/eg/inc/Hepevt.h @@ -14,7 +14,7 @@ #include "Rtypes.h" #if !defined(ROOT_TGenerator_cxx) && !defined(G__DICTIONARY) -#warning "This header is an implementation detail, is deprecated and will be moved to ROOT/Hepevt.h in ROOT 6.44, and may be removed later on from public interface. Use instead the `TGenerator.h` public interface" +#warning "This header will be moved to ROOT/Hepevt.h in ROOT 6.44, and may be removed later on from public interface. Use instead the `TGenerator.h` public interface" #endif #include "cfortran.h" diff --git a/montecarlo/eg/inc/cfortran.h b/montecarlo/eg/inc/cfortran.h index 278c99af81bbd..476f777c91b4e 100644 --- a/montecarlo/eg/inc/cfortran.h +++ b/montecarlo/eg/inc/cfortran.h @@ -6,7 +6,7 @@ #define __CFORTRAN_LOADED #if !defined(ROOT_TGenerator_cxx) && !defined(G__DICTIONARY) -#warning "This header is an implementation detail, is deprecated and will be moved to ROOT/cfortran.h in ROOT 6.44, and may be removed later on from public inteface. Use instead the `cfortran.h` header from `cfitsio` library" +#warning "This header will be moved to ROOT/cfortran.h in ROOT 6.44, and may be removed later on from public inteface. Use instead the `cfortran.h` header from `cfitsio` library" #endif /* diff --git a/net/net/inc/NetErrors.h b/net/net/inc/NetErrors.h index 526cad67f8f32..c1bcca6d33dd7 100644 --- a/net/net/inc/NetErrors.h +++ b/net/net/inc/NetErrors.h @@ -14,7 +14,7 @@ #if !defined(ROOT_NetErrors_cxx) && !defined(G__DICTIONARY) -#warning "This header is deprecated and will be removed from the public interface in ROOT 6.44. Use instead TSocket public interface." +#warning "This header is deprecated and will be removed after ROOT 7. Use instead TSocket public interface." #endif ////////////////////////////////////////////////////////////////////////// diff --git a/roofit/histfactory/inc/RooStats/HistFactory/Asimov.h b/roofit/histfactory/inc/RooStats/HistFactory/Asimov.h index 14fcf1568c989..d2b58e9a6d07a 100644 --- a/roofit/histfactory/inc/RooStats/HistFactory/Asimov.h +++ b/roofit/histfactory/inc/RooStats/HistFactory/Asimov.h @@ -1 +1 @@ -#warning "Header is deprecated and will be removed in ROOT 7. Just include RooStats/HistFactory/Measurement.h" +#warning "This header is deprecated and will be removed after ROOT 7. Just include RooStats/HistFactory/Measurement.h" diff --git a/roofit/histfactory/inc/RooStats/HistFactory/Channel.h b/roofit/histfactory/inc/RooStats/HistFactory/Channel.h index 14fcf1568c989..d2b58e9a6d07a 100644 --- a/roofit/histfactory/inc/RooStats/HistFactory/Channel.h +++ b/roofit/histfactory/inc/RooStats/HistFactory/Channel.h @@ -1 +1 @@ -#warning "Header is deprecated and will be removed in ROOT 7. Just include RooStats/HistFactory/Measurement.h" +#warning "This header is deprecated and will be removed after ROOT 7. Just include RooStats/HistFactory/Measurement.h" diff --git a/roofit/histfactory/inc/RooStats/HistFactory/Systematics.h b/roofit/histfactory/inc/RooStats/HistFactory/Systematics.h index 14fcf1568c989..d2b58e9a6d07a 100644 --- a/roofit/histfactory/inc/RooStats/HistFactory/Systematics.h +++ b/roofit/histfactory/inc/RooStats/HistFactory/Systematics.h @@ -1 +1 @@ -#warning "Header is deprecated and will be removed in ROOT 7. Just include RooStats/HistFactory/Measurement.h" +#warning "This header is deprecated and will be removed after ROOT 7. Just include RooStats/HistFactory/Measurement.h" diff --git a/tree/tree/inc/TreeUtils.h b/tree/tree/inc/TreeUtils.h index 6b79382d1495d..133156509031c 100644 --- a/tree/tree/inc/TreeUtils.h +++ b/tree/tree/inc/TreeUtils.h @@ -23,7 +23,7 @@ #define ROOT_TreeUtils #if !defined(ROOT_TreeUtils_cxx) && !defined(G__DICTIONARY) && !defined(__ROOTCLING__) && !defined(__CLING__) -#warning "This header is deprecated and will be removed in ROOT 6.44, use instead TNtuple::ReadStream or TNtupleD::ReadStream" +#warning "This header is deprecated and will be removed after ROOT 7. Use instead TNtuple::ReadStream or TNtupleD::ReadStream" #endif #include diff --git a/tree/treeviewer/inc/HelpTextTV.h b/tree/treeviewer/inc/HelpTextTV.h index c22612597c84e..d8f68c3679b56 100644 --- a/tree/treeviewer/inc/HelpTextTV.h +++ b/tree/treeviewer/inc/HelpTextTV.h @@ -13,7 +13,7 @@ #define ROOT_HelpTextTV #if !defined(ROOT_HelpTextTV_cxx) && !defined(G__DICTIONARY) -#warning "This header is deprecated and will be removed in ROOT 6.44" +#warning "This header is deprecated and will be removed after ROOT 7." #endif #include From 31b82c60427b271aeb1e3642fbcfbf7bb29b9822 Mon Sep 17 00:00:00 2001 From: Stephan Hageboeck Date: Wed, 28 Oct 2026 16:28:47 +0100 Subject: [PATCH 2/2] [RelNotes] Adapt release notes to unified header deprecation timeline. --- README/ReleaseNotes/v642/index.md | 38 +++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index fdd458aea1721..df4c2dceda255 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -83,26 +83,26 @@ The `TMVA_SOFIE_GNN` tutorials have been migrated to this workflow and produce i * The `ROOT::Math::ParamFunctionBase`, `ROOT::Math::ParamFunctorHandler` and `ROOT::Math::ParamMemFunHandler` classes in `Math/ParamFunctor.h` are removed, together with the `ParamFunctor::GetImpl()` and `ParamFunctor::SetFunction()` methods that exposed them. They implemented the type erasure that `ParamFunctor` now gets from `std::function`, mirroring what was already done for `ROOT::Math::Functor`. Constructing and calling a `ParamFunctor` is unchanged, except that the constructor from an object and one of its member functions now takes a plain pointer to the object instead of anything dereferenceable, so smart pointers are no longer accepted there. * The header `compiledata.h` will be renamed in ROOT 6.44. It did not have header guards and is not meant to be used directly. It is solely used by ROOT internally to setup `ACLiC`, consider using `gSystem` instead to access its content. * Including `RConfig.h` and `RVersion.h` is now deprecated and will be removed after ROOT 6.44, use instead `ROOT/RConfig.hxx` and `ROOT/RVersion.hxx`. -* The header `Rpair.h` is deprecated and will be removed after ROOT 6.44, use `` instead. -* The header `Hparam.h` and `Hoption.h` are now deprecated and will be removed in ROOT 6.44, use instead `THistPainter`, `TGraph2DPainter` public interfaces. -* The headers `Htypes.h` and `Gtypes.h` that were deprecated in ROOT 6.20 will now emit warnings and will be fully removed in ROOT 6.44. Use instead `Rtypes.h`. * The headers of the `bvh` library in `Geom` are no longer public in ROOT 6.42. -* The header `GLConstants.h` is no longer part of ROOT installed headers. -* The header `Bswapcpy.h` is deprecated and will be removed from the public interface after ROOT 6.44, it's an implementation detail for Unix i386 GNUC used by TBufferFile. -* The header `VectorizedTMath.h` is deprecated and will be removed in ROOT 6.44. Use instead `TMathVectorized.h`. -* The header `PosixThreadInc.h` is deprecated and will be removed after ROOT 6.44. Use instead `` and ``. -* The header `RStringView.h` deprecated in ROOT 6.14 will now emit warnings and will be fully removed after ROOT 6.44. Use `ROOT/RStringView.hxx` instead. -* The header `NetErrors.h` is an implementation detail, is deprecated and will be removed in ROOT 6.44. Use instead `TSocket` public interface. -* The headers `strlcpy.h` and `strtok.h` are deprecated (but will not emit warnings) and will no longer be part of ROOT installed headers in ROOT 6.44. -* The header `snprintf.h` is deprecated (will emit warnings) and will be removed in ROOT 6.44. Use instead ``. -* The header `Strlen.h` is deprecated and will be removed in ROOT 6.44. Use `` directly as a replacement. `NEED_STRING` macro should not be defined or an error will be raised. -* The header `HelpTextTV.h` is deprecated and will be removed in ROOT 6.44. -* The header `Varargs.h` and the macro `R__VA_COPY` are deprecated and will be removed in ROOT 6.46, use `` instead. -* The header `TreeUtils.h` is deprecated and will be removed in ROOT 6.44, use instead `TNtuple::ReadStream` or `TNtupleD::ReadStream`. -* The header `Riostream.h` is deprecated and will be removed after ROOT 6.44, use `` or `` or `` instead. -* The header `Rstrstream.h` is deprecated and will be removed after ROOT 6.44, use instead ``. -* The headers `ZipLZMA.h`, `ZipLZ4.h` and `ZipZSTD.h` are deprecated and will be removed in ROOT 6.46, use instead the public methods in the `RZip.h` interface. -* The headers `Hepevt.h` and `cfortran.h` are deprecated and will be moved to `ROOT/Hepevt.h` and `ROOT/cfortran.h` in ROOT 6.44. At a later time point they may be fully removed from ROOT public headers, consider using instead the `TGenerator.h` public interface or the `cfortran.h` header of the `cfitsio` library, respectively. +* Usage of the following headers is now deprecated. These will be removed during the lifetime of ROOT 7: + * `Rpair.h`: use `` instead. + * `Hparam.h` and `Hoption.h`: use instead `THistPainter`, `TGraph2DPainter` public interfaces. + * `Htypes.h` and `Gtypes.h`: Use instead `Rtypes.h`. + * `Bswapcpy.h`: no replacement. + * `VectorizedTMath.h`: use instead `TMathVectorized.h`. + * `PosixThreadInc.h`: use instead `` and ``. + * `RStringView.h`: use `` or `ROOT/RStringView.hxx` instead. + * `NetErrors.h`: Use instead `TSocket` public interface. + * `strlcpy.h` and `strtok.h`: are deprecated (but will not emit warnings) and will no longer be part of ROOT installed headers in ROOT 6.44. + * `snprintf.h`: use instead ``. + * `Strlen.h`: use `` directly as a replacement. `NEED_STRING` macro should not be defined or an error will be raised. + * `HelpTextTV.h`: no replacement. + * `Varargs.h` and the macro `R__VA_COPY`: use `` instead. + * `TreeUtils.h`: use instead `TNtuple::ReadStream` or `TNtupleD::ReadStream`. + * `Riostream.h`: use ``, `` or `` instead. + * `Rstrstream.h`: use instead ``. + * `ZipLZMA.h`, `ZipLZ4.h` and `ZipZSTD.h`: use instead the public methods in the `RZip.h` interface. + * `Hepevt.h` and `cfortran.h`: these will be moved to `ROOT/Hepevt.h` and `ROOT/cfortran.h` in ROOT 6.44. At a later time point they may be fully removed from ROOT public headers, consider using instead the `TGenerator.h` public interface or the `cfortran.h` header of the `cfitsio` library, respectively. * Remove outdated `TSQLFile` class, was not tested for very long time, not working with only supported sqlite DB ## Build System