From 1f429232a218bb8d945346dab83aa85df85395aa Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Wed, 16 Sep 2026 19:43:52 +0200 Subject: [PATCH] [tree] deprecate implementation detail header TreeUtils.h --- README/ReleaseNotes/v642/index.md | 1 + tree/tree/inc/TreeUtils.h | 4 ++++ tree/tree/src/TNtuple.cxx | 1 + tree/tree/src/TNtupleD.cxx | 1 + tree/tree/src/TreeUtils.cxx | 3 ++- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index 61c80c9c5b822..290626308fc60 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -80,6 +80,7 @@ The `TMVA_SOFIE_GNN` tutorials have been migrated to this workflow and produce i * 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 `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. diff --git a/tree/tree/inc/TreeUtils.h b/tree/tree/inc/TreeUtils.h index a74adf0320ad1..97403e547bd0e 100644 --- a/tree/tree/inc/TreeUtils.h +++ b/tree/tree/inc/TreeUtils.h @@ -22,6 +22,10 @@ #ifndef ROOT_TreeUtils #define ROOT_TreeUtils +#if !defined(ROOT_TreeUtils_cxx) && !defined(G__DICTIONARY) +#warning "This header is deprecated and will be removed in ROOT 6.44, use instead TNtuple::ReadStream or TNtupleD::ReadStream" +#endif + #include #include "RtypesCore.h" diff --git a/tree/tree/src/TNtuple.cxx b/tree/tree/src/TNtuple.cxx index 69dbc12efd682..188b72cbc8cc5 100644 --- a/tree/tree/src/TNtuple.cxx +++ b/tree/tree/src/TNtuple.cxx @@ -15,6 +15,7 @@ #include "TBranch.h" #include "TLeaf.h" #include "TBrowser.h" +#define ROOT_TreeUtils_cxx #include "TreeUtils.h" #include "strlcpy.h" diff --git a/tree/tree/src/TNtupleD.cxx b/tree/tree/src/TNtupleD.cxx index 4e34ca0349a74..1e08736f0c1d7 100644 --- a/tree/tree/src/TNtupleD.cxx +++ b/tree/tree/src/TNtupleD.cxx @@ -15,6 +15,7 @@ #include "TLeaf.h" #include "TBrowser.h" #include "TBuffer.h" +#define ROOT_TreeUtils_cxx #include "TreeUtils.h" #include "strlcpy.h" diff --git a/tree/tree/src/TreeUtils.cxx b/tree/tree/src/TreeUtils.cxx index faa1055ecd2ca..ca8362bfd5d8f 100644 --- a/tree/tree/src/TreeUtils.cxx +++ b/tree/tree/src/TreeUtils.cxx @@ -13,13 +13,14 @@ \ingroup tree Different standalone functions to work with trees and tuples, -not reqiuired to be a member of any class. +not required to be a member of any class. */ #include #include #include +#define ROOT_TreeUtils_cxx #include "TreeUtils.h" #include "TNtupleD.h" #include "TNtuple.h"