From 1f56159ea55ec667d6848a988b7424b5bdb601fd Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 17 Sep 2026 16:49:00 +0200 Subject: [PATCH 01/10] [hist] mv v5 headers to ROOT subfolder --- hist/hist/CMakeLists.txt | 6 +++--- hist/hist/inc/{ => ROOT}/v5/TF1Data.h | 2 +- hist/hist/inc/{ => ROOT}/v5/TFormula.h | 0 hist/hist/inc/{ => ROOT}/v5/TFormulaPrimitive.h | 0 hist/hist/src/TF1.cxx | 2 +- hist/hist/src/TF1Data_v5.cxx | 2 +- hist/hist/src/TFormula.cxx | 2 +- hist/hist/src/TFormulaMathInterface.cxx | 2 +- hist/hist/src/TFormulaPrimitive_v5.cxx | 2 +- hist/hist/src/TFormula_v5.cxx | 6 +++--- test/TFormulaTests.cxx | 2 +- tree/treeplayer/inc/TTreeFormula.h | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename hist/hist/inc/{ => ROOT}/v5/TF1Data.h (98%) rename hist/hist/inc/{ => ROOT}/v5/TFormula.h (100%) rename hist/hist/inc/{ => ROOT}/v5/TFormulaPrimitive.h (100%) diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt index d3b4610c72342..2993d637092d8 100644 --- a/hist/hist/CMakeLists.txt +++ b/hist/hist/CMakeLists.txt @@ -93,9 +93,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hist TVirtualPaveStats.h Math/WrappedMultiTF1.h Math/WrappedTF1.h - v5/TF1Data.h - v5/TFormula.h - v5/TFormulaPrimitive.h + ROOT/v5/TF1Data.h + ROOT/v5/TFormula.h + ROOT/v5/TFormulaPrimitive.h SOURCES AnalyticalIntegrals.cxx Haxis.cxx diff --git a/hist/hist/inc/v5/TF1Data.h b/hist/hist/inc/ROOT/v5/TF1Data.h similarity index 98% rename from hist/hist/inc/v5/TF1Data.h rename to hist/hist/inc/ROOT/v5/TF1Data.h index db4765c4e688a..1a9e4eef993e1 100644 --- a/hist/hist/inc/v5/TF1Data.h +++ b/hist/hist/inc/ROOT/v5/TF1Data.h @@ -25,7 +25,7 @@ #include "RConfigure.h" -#include "v5/TFormula.h" +#include "ROOT/v5/TFormula.h" #include "TAttLine.h" #include "TAttFill.h" #include "TAttMarker.h" diff --git a/hist/hist/inc/v5/TFormula.h b/hist/hist/inc/ROOT/v5/TFormula.h similarity index 100% rename from hist/hist/inc/v5/TFormula.h rename to hist/hist/inc/ROOT/v5/TFormula.h diff --git a/hist/hist/inc/v5/TFormulaPrimitive.h b/hist/hist/inc/ROOT/v5/TFormulaPrimitive.h similarity index 100% rename from hist/hist/inc/v5/TFormulaPrimitive.h rename to hist/hist/inc/ROOT/v5/TFormulaPrimitive.h diff --git a/hist/hist/src/TF1.cxx b/hist/hist/src/TF1.cxx index 8ca357fde9959..7aee5342face6 100644 --- a/hist/hist/src/TF1.cxx +++ b/hist/hist/src/TF1.cxx @@ -50,7 +50,7 @@ #include "Math/ChebyshevPol.h" #include "Fit/FitResult.h" // for I/O backward compatibility -#include "v5/TF1Data.h" +#include "ROOT/v5/TF1Data.h" #include "AnalyticalIntegrals.h" diff --git a/hist/hist/src/TF1Data_v5.cxx b/hist/hist/src/TF1Data_v5.cxx index bed79aab4254a..c58983e854625 100644 --- a/hist/hist/src/TF1Data_v5.cxx +++ b/hist/hist/src/TF1Data_v5.cxx @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#include "v5/TF1Data.h" +#include "ROOT/v5/TF1Data.h" #include "TBuffer.h" #include "TH1.h" diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx index 2888bf66c7c75..53d0c49f79b6c 100644 --- a/hist/hist/src/TFormula.cxx +++ b/hist/hist/src/TFormula.cxx @@ -37,7 +37,7 @@ using std::map, std::pair, std::make_pair, std::list, std::max, std::string; #ifdef WIN32 #pragma optimize("",off) #endif -#include "v5/TFormula.h" +#include "ROOT/v5/TFormula.h" namespace { diff --git a/hist/hist/src/TFormulaMathInterface.cxx b/hist/hist/src/TFormulaMathInterface.cxx index c8ae5aa2558e1..3b0e7ae125932 100644 --- a/hist/hist/src/TFormulaMathInterface.cxx +++ b/hist/hist/src/TFormulaMathInterface.cxx @@ -1,4 +1,4 @@ -#include "v5/TFormulaPrimitive.h" +#include "ROOT/v5/TFormulaPrimitive.h" #include "TMath.h" namespace ROOT { diff --git a/hist/hist/src/TFormulaPrimitive_v5.cxx b/hist/hist/src/TFormulaPrimitive_v5.cxx index 92b501ded3ade..4e691c13c0682 100644 --- a/hist/hist/src/TFormulaPrimitive_v5.cxx +++ b/hist/hist/src/TFormulaPrimitive_v5.cxx @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#include "v5/TFormulaPrimitive.h" +#include "ROOT/v5/TFormulaPrimitive.h" #include "TMath.h" #include "TNamed.h" diff --git a/hist/hist/src/TFormula_v5.cxx b/hist/hist/src/TFormula_v5.cxx index 172b4ec207722..1bc2f0ee49e3c 100644 --- a/hist/hist/src/TFormula_v5.cxx +++ b/hist/hist/src/TFormula_v5.cxx @@ -12,14 +12,14 @@ #include "TROOT.h" #include "TClass.h" #include "TBuffer.h" -#include "v5/TFormula.h" +#include "ROOT/v5/TFormula.h" #include "TMath.h" #include "TRandom.h" #include "TFunction.h" #include "TMethodCall.h" #include "TObjString.h" #include "TError.h" -#include "v5/TFormulaPrimitive.h" +#include "ROOT/v5/TFormulaPrimitive.h" #include "TInterpreter.h" #include "TVirtualMutex.h" #include "strlcpy.h" @@ -40,7 +40,7 @@ namespace ROOT { namespace v5 { -/** \class TFormula TFormula.h "inc/v5/TFormula.h" +/** \class TFormula TFormula.h "inc/ROOT/v5/TFormula.h" \ingroup Hist The FORMULA class (ROOT version 5) diff --git a/test/TFormulaTests.cxx b/test/TFormulaTests.cxx index 7df6e9da98ee4..46f87b67f5368 100644 --- a/test/TFormulaTests.cxx +++ b/test/TFormulaTests.cxx @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include "TFormulaParsingTests.h" diff --git a/tree/treeplayer/inc/TTreeFormula.h b/tree/treeplayer/inc/TTreeFormula.h index 67324d3b08ea2..83cf05052166a 100644 --- a/tree/treeplayer/inc/TTreeFormula.h +++ b/tree/treeplayer/inc/TTreeFormula.h @@ -23,7 +23,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "v5/TFormula.h" +#include "ROOT/v5/TFormula.h" #include "TLeaf.h" From 09027866278a7f2cc428d46f689443aa275bae0e Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 17 Sep 2026 16:55:25 +0200 Subject: [PATCH 02/10] [hist] add deprecation notice and fallback headers --- README/ReleaseNotes/v642/index.md | 1 + hist/hist/inc/v5/TF1Data.h | 10 ++++++++++ hist/hist/inc/v5/TFormula.h | 10 ++++++++++ hist/hist/inc/v5/TFormulaPrimitive.h | 10 ++++++++++ 4 files changed, 31 insertions(+) create mode 100644 hist/hist/inc/v5/TF1Data.h create mode 100644 hist/hist/inc/v5/TFormula.h create mode 100644 hist/hist/inc/v5/TFormulaPrimitive.h diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index 7056c9453b14b..eb3d328410074 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -76,6 +76,7 @@ The `TMVA_SOFIE_GNN` tutorials have been migrated to this workflow and produce i * 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 legacy headers `v5/TF1Data.h`, `v5/TFormula.h` and `v5/TFormulaPrimitive.h` have been moved to `ROOT/v5/TF1Data.h`, `ROOT/v5/TFormula.h` and `ROOT/v5/TFormulaPrimitive.h`. Including them as before will now raise warnings and will be no longer supported in ROOT 6.44. * 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 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. diff --git a/hist/hist/inc/v5/TF1Data.h b/hist/hist/inc/v5/TF1Data.h new file mode 100644 index 0000000000000..11f1540ad8926 --- /dev/null +++ b/hist/hist/inc/v5/TF1Data.h @@ -0,0 +1,10 @@ +#ifndef ROOT_v5_TF1Data_fwd +#define ROOT_v5_TF1Data_fwd + +#include "ROOT/v5/TF1Data.h" + +#ifndef G__DICTIONARY +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Prepend `ROOT/` to your include statement." +#endif + +#endif diff --git a/hist/hist/inc/v5/TFormula.h b/hist/hist/inc/v5/TFormula.h new file mode 100644 index 0000000000000..75895198c0cea --- /dev/null +++ b/hist/hist/inc/v5/TFormula.h @@ -0,0 +1,10 @@ +#ifndef ROOT_v5_TFormula_fwd +#define ROOT_v5_TFormula_fwd + +#include "ROOT/v5/TFormula.h" + +#ifndef G__DICTIONARY +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Prepend `ROOT/` to your include statement." +#endif + +#endif diff --git a/hist/hist/inc/v5/TFormulaPrimitive.h b/hist/hist/inc/v5/TFormulaPrimitive.h new file mode 100644 index 0000000000000..8f01721c263e5 --- /dev/null +++ b/hist/hist/inc/v5/TFormulaPrimitive.h @@ -0,0 +1,10 @@ +#ifndef ROOT_v5_TFormulaPrimitive_fwd +#define ROOT_v5_TFormulaPrimitive_fwd + +#include "ROOT/v5/TFormulaPrimitive.h" + +#ifndef G__DICTIONARY +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Prepend `ROOT/` to your include statement." +#endif + +#endif From 8221cd8f25ecf8bff09e0e0bba4e0055d1a26620 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Sun, 20 Sep 2026 18:08:54 +0200 Subject: [PATCH 03/10] [nfc] more explicit recommend message Co-authored-by: Philippe Canal --- hist/hist/inc/v5/TF1Data.h | 2 +- hist/hist/inc/v5/TFormula.h | 2 +- hist/hist/inc/v5/TFormulaPrimitive.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hist/hist/inc/v5/TF1Data.h b/hist/hist/inc/v5/TF1Data.h index 11f1540ad8926..d26d2505a8690 100644 --- a/hist/hist/inc/v5/TF1Data.h +++ b/hist/hist/inc/v5/TF1Data.h @@ -4,7 +4,7 @@ #include "ROOT/v5/TF1Data.h" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Prepend `ROOT/` to your include statement." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TF1Data.h'." #endif #endif diff --git a/hist/hist/inc/v5/TFormula.h b/hist/hist/inc/v5/TFormula.h index 75895198c0cea..86a594486eec6 100644 --- a/hist/hist/inc/v5/TFormula.h +++ b/hist/hist/inc/v5/TFormula.h @@ -4,7 +4,7 @@ #include "ROOT/v5/TFormula.h" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Prepend `ROOT/` to your include statement." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormula.h'." #endif #endif diff --git a/hist/hist/inc/v5/TFormulaPrimitive.h b/hist/hist/inc/v5/TFormulaPrimitive.h index 8f01721c263e5..07f75fcc13e33 100644 --- a/hist/hist/inc/v5/TFormulaPrimitive.h +++ b/hist/hist/inc/v5/TFormulaPrimitive.h @@ -4,7 +4,7 @@ #include "ROOT/v5/TFormulaPrimitive.h" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Prepend `ROOT/` to your include statement." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormulaPrimitive.h'." #endif #endif From 578616c54514669a8ebca347d0105bfe4162d95f Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Mon, 21 Sep 2026 07:18:45 +0200 Subject: [PATCH 04/10] [histv5] rename header extension to hxx --- README/ReleaseNotes/v642/index.md | 2 +- hist/hist/CMakeLists.txt | 6 +++--- hist/hist/inc/ROOT/v5/{TF1Data.h => TF1Data.hxx} | 2 +- hist/hist/inc/ROOT/v5/{TFormula.h => TFormula.hxx} | 0 .../ROOT/v5/{TFormulaPrimitive.h => TFormulaPrimitive.hxx} | 0 hist/hist/inc/v5/TF1Data.h | 4 ++-- hist/hist/inc/v5/TFormula.h | 4 ++-- hist/hist/inc/v5/TFormulaPrimitive.h | 4 ++-- hist/hist/src/TF1.cxx | 2 +- hist/hist/src/TF1Data_v5.cxx | 2 +- hist/hist/src/TFormula.cxx | 2 +- hist/hist/src/TFormulaMathInterface.cxx | 2 +- hist/hist/src/TFormulaPrimitive_v5.cxx | 2 +- hist/hist/src/TFormula_v5.cxx | 2 +- test/TFormulaTests.cxx | 2 +- tree/treeplayer/inc/TTreeFormula.h | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) rename hist/hist/inc/ROOT/v5/{TF1Data.h => TF1Data.hxx} (98%) rename hist/hist/inc/ROOT/v5/{TFormula.h => TFormula.hxx} (100%) rename hist/hist/inc/ROOT/v5/{TFormulaPrimitive.h => TFormulaPrimitive.hxx} (100%) diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index eb3d328410074..26e81e7900602 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -76,7 +76,7 @@ The `TMVA_SOFIE_GNN` tutorials have been migrated to this workflow and produce i * 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 legacy headers `v5/TF1Data.h`, `v5/TFormula.h` and `v5/TFormulaPrimitive.h` have been moved to `ROOT/v5/TF1Data.h`, `ROOT/v5/TFormula.h` and `ROOT/v5/TFormulaPrimitive.h`. Including them as before will now raise warnings and will be no longer supported in ROOT 6.44. +* The legacy headers `v5/TF1Data.h`, `v5/TFormula.h` and `v5/TFormulaPrimitive.h` have been moved to `ROOT/v5/TF1Data.hxx`, `ROOT/v5/TFormula.hxx` and `ROOT/v5/TFormulaPrimitive.hxx`. Including them as before will now raise warnings and will be no longer supported in ROOT 6.44. * 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 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. diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt index 2993d637092d8..7e9f225c9fe17 100644 --- a/hist/hist/CMakeLists.txt +++ b/hist/hist/CMakeLists.txt @@ -93,9 +93,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hist TVirtualPaveStats.h Math/WrappedMultiTF1.h Math/WrappedTF1.h - ROOT/v5/TF1Data.h - ROOT/v5/TFormula.h - ROOT/v5/TFormulaPrimitive.h + ROOT/v5/TF1Data.hxx + ROOT/v5/TFormula.hxx + ROOT/v5/TFormulaPrimitive.hxx SOURCES AnalyticalIntegrals.cxx Haxis.cxx diff --git a/hist/hist/inc/ROOT/v5/TF1Data.h b/hist/hist/inc/ROOT/v5/TF1Data.hxx similarity index 98% rename from hist/hist/inc/ROOT/v5/TF1Data.h rename to hist/hist/inc/ROOT/v5/TF1Data.hxx index 1a9e4eef993e1..cb95476d74a19 100644 --- a/hist/hist/inc/ROOT/v5/TF1Data.h +++ b/hist/hist/inc/ROOT/v5/TF1Data.hxx @@ -25,7 +25,7 @@ #include "RConfigure.h" -#include "ROOT/v5/TFormula.h" +#include "ROOT/v5/TFormula.hxx" #include "TAttLine.h" #include "TAttFill.h" #include "TAttMarker.h" diff --git a/hist/hist/inc/ROOT/v5/TFormula.h b/hist/hist/inc/ROOT/v5/TFormula.hxx similarity index 100% rename from hist/hist/inc/ROOT/v5/TFormula.h rename to hist/hist/inc/ROOT/v5/TFormula.hxx diff --git a/hist/hist/inc/ROOT/v5/TFormulaPrimitive.h b/hist/hist/inc/ROOT/v5/TFormulaPrimitive.hxx similarity index 100% rename from hist/hist/inc/ROOT/v5/TFormulaPrimitive.h rename to hist/hist/inc/ROOT/v5/TFormulaPrimitive.hxx diff --git a/hist/hist/inc/v5/TF1Data.h b/hist/hist/inc/v5/TF1Data.h index d26d2505a8690..91bac6f8aa68a 100644 --- a/hist/hist/inc/v5/TF1Data.h +++ b/hist/hist/inc/v5/TF1Data.h @@ -1,10 +1,10 @@ #ifndef ROOT_v5_TF1Data_fwd #define ROOT_v5_TF1Data_fwd -#include "ROOT/v5/TF1Data.h" +#include "ROOT/v5/TF1Data.hxx" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TF1Data.h'." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TF1Data.hxx'." #endif #endif diff --git a/hist/hist/inc/v5/TFormula.h b/hist/hist/inc/v5/TFormula.h index 86a594486eec6..1090e70db83c0 100644 --- a/hist/hist/inc/v5/TFormula.h +++ b/hist/hist/inc/v5/TFormula.h @@ -1,10 +1,10 @@ #ifndef ROOT_v5_TFormula_fwd #define ROOT_v5_TFormula_fwd -#include "ROOT/v5/TFormula.h" +#include "ROOT/v5/TFormula.hxx" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormula.h'." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormula.hxx'." #endif #endif diff --git a/hist/hist/inc/v5/TFormulaPrimitive.h b/hist/hist/inc/v5/TFormulaPrimitive.h index 07f75fcc13e33..3b76e5fd3a993 100644 --- a/hist/hist/inc/v5/TFormulaPrimitive.h +++ b/hist/hist/inc/v5/TFormulaPrimitive.h @@ -1,10 +1,10 @@ #ifndef ROOT_v5_TFormulaPrimitive_fwd #define ROOT_v5_TFormulaPrimitive_fwd -#include "ROOT/v5/TFormulaPrimitive.h" +#include "ROOT/v5/TFormulaPrimitive.hxx" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormulaPrimitive.h'." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormulaPrimitive.hxx'." #endif #endif diff --git a/hist/hist/src/TF1.cxx b/hist/hist/src/TF1.cxx index 7aee5342face6..a04f8d5b14755 100644 --- a/hist/hist/src/TF1.cxx +++ b/hist/hist/src/TF1.cxx @@ -50,7 +50,7 @@ #include "Math/ChebyshevPol.h" #include "Fit/FitResult.h" // for I/O backward compatibility -#include "ROOT/v5/TF1Data.h" +#include "ROOT/v5/TF1Data.hxx" #include "AnalyticalIntegrals.h" diff --git a/hist/hist/src/TF1Data_v5.cxx b/hist/hist/src/TF1Data_v5.cxx index c58983e854625..9427071ed90da 100644 --- a/hist/hist/src/TF1Data_v5.cxx +++ b/hist/hist/src/TF1Data_v5.cxx @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#include "ROOT/v5/TF1Data.h" +#include "ROOT/v5/TF1Data.hxx" #include "TBuffer.h" #include "TH1.h" diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx index 53d0c49f79b6c..0b82a8f401574 100644 --- a/hist/hist/src/TFormula.cxx +++ b/hist/hist/src/TFormula.cxx @@ -17,7 +17,7 @@ #include "TError.h" #include "TInterpreter.h" #include "TInterpreterValue.h" -#include "TFormula.h" +#include "TFormula.hxx" #include "TRegexp.h" #include "ROOT/StringUtils.hxx" diff --git a/hist/hist/src/TFormulaMathInterface.cxx b/hist/hist/src/TFormulaMathInterface.cxx index 3b0e7ae125932..d31c194a72b58 100644 --- a/hist/hist/src/TFormulaMathInterface.cxx +++ b/hist/hist/src/TFormulaMathInterface.cxx @@ -1,4 +1,4 @@ -#include "ROOT/v5/TFormulaPrimitive.h" +#include "ROOT/v5/TFormulaPrimitive.hxx" #include "TMath.h" namespace ROOT { diff --git a/hist/hist/src/TFormulaPrimitive_v5.cxx b/hist/hist/src/TFormulaPrimitive_v5.cxx index 4e691c13c0682..b57bca9e0d598 100644 --- a/hist/hist/src/TFormulaPrimitive_v5.cxx +++ b/hist/hist/src/TFormulaPrimitive_v5.cxx @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#include "ROOT/v5/TFormulaPrimitive.h" +#include "ROOT/v5/TFormulaPrimitive.hxx" #include "TMath.h" #include "TNamed.h" diff --git a/hist/hist/src/TFormula_v5.cxx b/hist/hist/src/TFormula_v5.cxx index 1bc2f0ee49e3c..4d3f277989d0b 100644 --- a/hist/hist/src/TFormula_v5.cxx +++ b/hist/hist/src/TFormula_v5.cxx @@ -12,7 +12,7 @@ #include "TROOT.h" #include "TClass.h" #include "TBuffer.h" -#include "ROOT/v5/TFormula.h" +#include "ROOT/v5/TFormula.hxx" #include "TMath.h" #include "TRandom.h" #include "TFunction.h" diff --git a/test/TFormulaTests.cxx b/test/TFormulaTests.cxx index 46f87b67f5368..93aa3579b15d6 100644 --- a/test/TFormulaTests.cxx +++ b/test/TFormulaTests.cxx @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include "TFormulaParsingTests.h" diff --git a/tree/treeplayer/inc/TTreeFormula.h b/tree/treeplayer/inc/TTreeFormula.h index 83cf05052166a..0b787a57c8745 100644 --- a/tree/treeplayer/inc/TTreeFormula.h +++ b/tree/treeplayer/inc/TTreeFormula.h @@ -23,7 +23,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "ROOT/v5/TFormula.h" +#include "ROOT/v5/TFormula.hxx" #include "TLeaf.h" From 8f2dab16466e24dd2ffb616e3daddde94a127197 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 29 Sep 2026 15:12:43 +0200 Subject: [PATCH 05/10] [hist] fix header includes --- hist/hist/src/TFormula.cxx | 2 +- hist/hist/src/TFormula_v5.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx index 0b82a8f401574..53d0c49f79b6c 100644 --- a/hist/hist/src/TFormula.cxx +++ b/hist/hist/src/TFormula.cxx @@ -17,7 +17,7 @@ #include "TError.h" #include "TInterpreter.h" #include "TInterpreterValue.h" -#include "TFormula.hxx" +#include "TFormula.h" #include "TRegexp.h" #include "ROOT/StringUtils.hxx" diff --git a/hist/hist/src/TFormula_v5.cxx b/hist/hist/src/TFormula_v5.cxx index 4d3f277989d0b..7f0189831c9e3 100644 --- a/hist/hist/src/TFormula_v5.cxx +++ b/hist/hist/src/TFormula_v5.cxx @@ -19,7 +19,7 @@ #include "TMethodCall.h" #include "TObjString.h" #include "TError.h" -#include "ROOT/v5/TFormulaPrimitive.h" +#include "ROOT/v5/TFormulaPrimitive.hxx" #include "TInterpreter.h" #include "TVirtualMutex.h" #include "strlcpy.h" From ca093fb0f181fd6997b395a0ed1bb5714afaf0f5 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Tue, 29 Sep 2026 15:32:49 +0200 Subject: [PATCH 06/10] fix header name --- hist/hist/src/TFormula.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx index 53d0c49f79b6c..324d3396cd515 100644 --- a/hist/hist/src/TFormula.cxx +++ b/hist/hist/src/TFormula.cxx @@ -37,7 +37,7 @@ using std::map, std::pair, std::make_pair, std::list, std::max, std::string; #ifdef WIN32 #pragma optimize("",off) #endif -#include "ROOT/v5/TFormula.h" +#include "ROOT/v5/TFormula.hxx" namespace { From 5d5efba84affffdda1576734194a938c72afd602 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 30 Sep 2026 20:13:50 +0200 Subject: [PATCH 07/10] [tree] rename header back to .h --- README/ReleaseNotes/v642/index.md | 2 +- hist/hist/CMakeLists.txt | 6 +++--- hist/hist/inc/ROOT/v5/TF1Data.hxx | 2 +- hist/hist/inc/v5/TF1Data.h | 4 ++-- hist/hist/inc/v5/TFormula.h | 4 ++-- hist/hist/inc/v5/TFormulaPrimitive.h | 4 ++-- hist/hist/src/TF1.cxx | 2 +- hist/hist/src/TF1Data_v5.cxx | 2 +- hist/hist/src/TFormula.cxx | 2 +- hist/hist/src/TFormulaMathInterface.cxx | 2 +- hist/hist/src/TFormulaPrimitive_v5.cxx | 2 +- hist/hist/src/TFormula_v5.cxx | 4 ++-- test/TFormulaTests.cxx | 2 +- tree/treeplayer/inc/TTreeFormula.h | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index 26e81e7900602..eb3d328410074 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -76,7 +76,7 @@ The `TMVA_SOFIE_GNN` tutorials have been migrated to this workflow and produce i * 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 legacy headers `v5/TF1Data.h`, `v5/TFormula.h` and `v5/TFormulaPrimitive.h` have been moved to `ROOT/v5/TF1Data.hxx`, `ROOT/v5/TFormula.hxx` and `ROOT/v5/TFormulaPrimitive.hxx`. Including them as before will now raise warnings and will be no longer supported in ROOT 6.44. +* The legacy headers `v5/TF1Data.h`, `v5/TFormula.h` and `v5/TFormulaPrimitive.h` have been moved to `ROOT/v5/TF1Data.h`, `ROOT/v5/TFormula.h` and `ROOT/v5/TFormulaPrimitive.h`. Including them as before will now raise warnings and will be no longer supported in ROOT 6.44. * 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 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. diff --git a/hist/hist/CMakeLists.txt b/hist/hist/CMakeLists.txt index 7e9f225c9fe17..2993d637092d8 100644 --- a/hist/hist/CMakeLists.txt +++ b/hist/hist/CMakeLists.txt @@ -93,9 +93,9 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Hist TVirtualPaveStats.h Math/WrappedMultiTF1.h Math/WrappedTF1.h - ROOT/v5/TF1Data.hxx - ROOT/v5/TFormula.hxx - ROOT/v5/TFormulaPrimitive.hxx + ROOT/v5/TF1Data.h + ROOT/v5/TFormula.h + ROOT/v5/TFormulaPrimitive.h SOURCES AnalyticalIntegrals.cxx Haxis.cxx diff --git a/hist/hist/inc/ROOT/v5/TF1Data.hxx b/hist/hist/inc/ROOT/v5/TF1Data.hxx index cb95476d74a19..1a9e4eef993e1 100644 --- a/hist/hist/inc/ROOT/v5/TF1Data.hxx +++ b/hist/hist/inc/ROOT/v5/TF1Data.hxx @@ -25,7 +25,7 @@ #include "RConfigure.h" -#include "ROOT/v5/TFormula.hxx" +#include "ROOT/v5/TFormula.h" #include "TAttLine.h" #include "TAttFill.h" #include "TAttMarker.h" diff --git a/hist/hist/inc/v5/TF1Data.h b/hist/hist/inc/v5/TF1Data.h index 91bac6f8aa68a..d26d2505a8690 100644 --- a/hist/hist/inc/v5/TF1Data.h +++ b/hist/hist/inc/v5/TF1Data.h @@ -1,10 +1,10 @@ #ifndef ROOT_v5_TF1Data_fwd #define ROOT_v5_TF1Data_fwd -#include "ROOT/v5/TF1Data.hxx" +#include "ROOT/v5/TF1Data.h" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TF1Data.hxx'." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TF1Data.h'." #endif #endif diff --git a/hist/hist/inc/v5/TFormula.h b/hist/hist/inc/v5/TFormula.h index 1090e70db83c0..86a594486eec6 100644 --- a/hist/hist/inc/v5/TFormula.h +++ b/hist/hist/inc/v5/TFormula.h @@ -1,10 +1,10 @@ #ifndef ROOT_v5_TFormula_fwd #define ROOT_v5_TFormula_fwd -#include "ROOT/v5/TFormula.hxx" +#include "ROOT/v5/TFormula.h" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormula.hxx'." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormula.h'." #endif #endif diff --git a/hist/hist/inc/v5/TFormulaPrimitive.h b/hist/hist/inc/v5/TFormulaPrimitive.h index 3b76e5fd3a993..07f75fcc13e33 100644 --- a/hist/hist/inc/v5/TFormulaPrimitive.h +++ b/hist/hist/inc/v5/TFormulaPrimitive.h @@ -1,10 +1,10 @@ #ifndef ROOT_v5_TFormulaPrimitive_fwd #define ROOT_v5_TFormulaPrimitive_fwd -#include "ROOT/v5/TFormulaPrimitive.hxx" +#include "ROOT/v5/TFormulaPrimitive.h" #ifndef G__DICTIONARY -#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormulaPrimitive.hxx'." +#warning "v5 legacy header has been moved to ROOT subfolder. This header is deprecated and will be removed in ROOT 6.44. Use 'ROOT/v5/TFormulaPrimitive.h'." #endif #endif diff --git a/hist/hist/src/TF1.cxx b/hist/hist/src/TF1.cxx index a04f8d5b14755..7aee5342face6 100644 --- a/hist/hist/src/TF1.cxx +++ b/hist/hist/src/TF1.cxx @@ -50,7 +50,7 @@ #include "Math/ChebyshevPol.h" #include "Fit/FitResult.h" // for I/O backward compatibility -#include "ROOT/v5/TF1Data.hxx" +#include "ROOT/v5/TF1Data.h" #include "AnalyticalIntegrals.h" diff --git a/hist/hist/src/TF1Data_v5.cxx b/hist/hist/src/TF1Data_v5.cxx index 9427071ed90da..c58983e854625 100644 --- a/hist/hist/src/TF1Data_v5.cxx +++ b/hist/hist/src/TF1Data_v5.cxx @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#include "ROOT/v5/TF1Data.hxx" +#include "ROOT/v5/TF1Data.h" #include "TBuffer.h" #include "TH1.h" diff --git a/hist/hist/src/TFormula.cxx b/hist/hist/src/TFormula.cxx index 324d3396cd515..53d0c49f79b6c 100644 --- a/hist/hist/src/TFormula.cxx +++ b/hist/hist/src/TFormula.cxx @@ -37,7 +37,7 @@ using std::map, std::pair, std::make_pair, std::list, std::max, std::string; #ifdef WIN32 #pragma optimize("",off) #endif -#include "ROOT/v5/TFormula.hxx" +#include "ROOT/v5/TFormula.h" namespace { diff --git a/hist/hist/src/TFormulaMathInterface.cxx b/hist/hist/src/TFormulaMathInterface.cxx index d31c194a72b58..3b0e7ae125932 100644 --- a/hist/hist/src/TFormulaMathInterface.cxx +++ b/hist/hist/src/TFormulaMathInterface.cxx @@ -1,4 +1,4 @@ -#include "ROOT/v5/TFormulaPrimitive.hxx" +#include "ROOT/v5/TFormulaPrimitive.h" #include "TMath.h" namespace ROOT { diff --git a/hist/hist/src/TFormulaPrimitive_v5.cxx b/hist/hist/src/TFormulaPrimitive_v5.cxx index b57bca9e0d598..4e691c13c0682 100644 --- a/hist/hist/src/TFormulaPrimitive_v5.cxx +++ b/hist/hist/src/TFormulaPrimitive_v5.cxx @@ -9,7 +9,7 @@ * For the list of contributors see $ROOTSYS/README/CREDITS. * *************************************************************************/ -#include "ROOT/v5/TFormulaPrimitive.hxx" +#include "ROOT/v5/TFormulaPrimitive.h" #include "TMath.h" #include "TNamed.h" diff --git a/hist/hist/src/TFormula_v5.cxx b/hist/hist/src/TFormula_v5.cxx index 7f0189831c9e3..1bc2f0ee49e3c 100644 --- a/hist/hist/src/TFormula_v5.cxx +++ b/hist/hist/src/TFormula_v5.cxx @@ -12,14 +12,14 @@ #include "TROOT.h" #include "TClass.h" #include "TBuffer.h" -#include "ROOT/v5/TFormula.hxx" +#include "ROOT/v5/TFormula.h" #include "TMath.h" #include "TRandom.h" #include "TFunction.h" #include "TMethodCall.h" #include "TObjString.h" #include "TError.h" -#include "ROOT/v5/TFormulaPrimitive.hxx" +#include "ROOT/v5/TFormulaPrimitive.h" #include "TInterpreter.h" #include "TVirtualMutex.h" #include "strlcpy.h" diff --git a/test/TFormulaTests.cxx b/test/TFormulaTests.cxx index 93aa3579b15d6..46f87b67f5368 100644 --- a/test/TFormulaTests.cxx +++ b/test/TFormulaTests.cxx @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include "TFormulaParsingTests.h" diff --git a/tree/treeplayer/inc/TTreeFormula.h b/tree/treeplayer/inc/TTreeFormula.h index 0b787a57c8745..83cf05052166a 100644 --- a/tree/treeplayer/inc/TTreeFormula.h +++ b/tree/treeplayer/inc/TTreeFormula.h @@ -23,7 +23,7 @@ // // ////////////////////////////////////////////////////////////////////////// -#include "ROOT/v5/TFormula.hxx" +#include "ROOT/v5/TFormula.h" #include "TLeaf.h" From ebc2cd5386d403357b10f04f90208c5cb5b19599 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 30 Sep 2026 20:14:28 +0200 Subject: [PATCH 08/10] Rename TF1Data.hxx to TF1Data.h --- hist/hist/inc/ROOT/v5/{TF1Data.hxx => TF1Data.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hist/hist/inc/ROOT/v5/{TF1Data.hxx => TF1Data.h} (100%) diff --git a/hist/hist/inc/ROOT/v5/TF1Data.hxx b/hist/hist/inc/ROOT/v5/TF1Data.h similarity index 100% rename from hist/hist/inc/ROOT/v5/TF1Data.hxx rename to hist/hist/inc/ROOT/v5/TF1Data.h From 02aaa68db8c9253cd8b8f7ee2ddf59aed5b801a5 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 30 Sep 2026 20:14:49 +0200 Subject: [PATCH 09/10] Rename TFormula.hxx to TFormula.h --- hist/hist/inc/ROOT/v5/{TFormula.hxx => TFormula.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hist/hist/inc/ROOT/v5/{TFormula.hxx => TFormula.h} (100%) diff --git a/hist/hist/inc/ROOT/v5/TFormula.hxx b/hist/hist/inc/ROOT/v5/TFormula.h similarity index 100% rename from hist/hist/inc/ROOT/v5/TFormula.hxx rename to hist/hist/inc/ROOT/v5/TFormula.h From 3d1a8b927ac96b46d74a2f791813e6587777ae19 Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 30 Sep 2026 20:15:14 +0200 Subject: [PATCH 10/10] Rename TFormulaPrimitive.hxx to TFormulaPrimitive.h --- .../inc/ROOT/v5/{TFormulaPrimitive.hxx => TFormulaPrimitive.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hist/hist/inc/ROOT/v5/{TFormulaPrimitive.hxx => TFormulaPrimitive.h} (100%) diff --git a/hist/hist/inc/ROOT/v5/TFormulaPrimitive.hxx b/hist/hist/inc/ROOT/v5/TFormulaPrimitive.h similarity index 100% rename from hist/hist/inc/ROOT/v5/TFormulaPrimitive.hxx rename to hist/hist/inc/ROOT/v5/TFormulaPrimitive.h