Unify deprecation/removal timeline for installed headers.

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 `<utility>` 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 `<ctime>` and `<cstdlib>`.
-* 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 `<cstdio>`.
-* The header `Strlen.h` is deprecated and will be removed in ROOT 6.44. Use `<cstring>` 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 `<cstdarg>` 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 `<iostream>` or `<fstream>` or `<iomanip>` instead.
-* The header `Rstrstream.h` is deprecated and will be removed after ROOT 6.44, use instead `<sstream>`.
-* 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 `<utility>` 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 `<ctime>` and `<cstdlib>`.
+  * `RStringView.h`: use `<string_view>` 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 `<cstdio>`.
+  * `Strlen.h`: use `<cstring>` 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 `<cstdarg>` instead.
+  * `TreeUtils.h`: use instead `TNtuple::ReadStream` or `TNtupleD::ReadStream`.
+  * `Riostream.h`: use `<iostream>`, `<fstream>` or `<iomanip>` instead.
+  * `Rstrstream.h`: use instead `<sstream>`.
+  * `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

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"

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
 
 

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"
 

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"
 

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 <fstream>, <iostream> or <iomanip>."
+#warning "This header is deprecated and will be removed after ROOT 7. Use instead <fstream>, <iostream> or <iomanip>."
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //

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 <utility>"
+#warning "This header is obsolete and will be removed in ROOT 7, use instead <utility>"
 
 // Include the definition of pairs
 #include <utility>

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 <cstring> instead"
+#warning "This header is deprecated and will be removed after ROOT 7. Use <cstring> instead"
 
 #ifdef NEED_STRING
 #error "ROOT no longer provides implementation for strlen, NEED_STRING macro should not be defined."

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 <cstdarg> instead."
+#warning "This header is deprecated and will be removed after ROOT 7. Include <cstdarg> instead."
 
 #if defined(sparc) && defined(__CC_ATT301__)
 

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 <ROOT/RStringView.hxx>

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 <sstream>"
+#warning "This header is deprecated and will be removed after ROOT 7, used instead <sstream>"
 
 #include <ROOT/RConfig.hxx>
 

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.

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" {

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 <cstdlib> and <ctime>"
+#warning "This header is deprecated and will be removed after ROOT 7. Use instead <cstdlib> and <ctime>"
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //

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.

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
 
 ////////////////////////////////////////////////////////////////////////////////

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 {

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"

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"

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
 
 /*

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
 
 //////////////////////////////////////////////////////////////////////////

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"

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"

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"

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 <iosfwd>

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 <RtypesCore.h>