From 7966deed7976c6afb5ef564e2d26cab7be073caf Mon Sep 17 00:00:00 2001
From: Philippe Canal <pcanal@fnal.gov>
Date: Tue, 2 Mar 2021 15:34:36 -0600
Subject: [PATCH] 'Hide' kOnlyPrepStep as a protected member of TObject.
This enum will be removed shortly (functionality moved from TObject::Write to *::Merge)
---
core/base/inc/TObject.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/core/base/inc/TObject.h b/core/base/inc/TObject.h
index f3646aa4f4c..0637421f9cd 100644
--- a/core/base/inc/TObject.h
+++ b/core/base/inc/TObject.h
@@ -87,17 +87,23 @@ public:
kSingleKey = BIT(0), ///< write collection with single key
kOverwrite = BIT(1), ///< overwrite existing object with same name
kWriteDelete = BIT(2), ///< write object, then delete previous key with same name
+ };
- ///< Used to request that the class specific implementation of `TObject::Write`
+protected:
+ enum DeprectatedWriteOpions {
+ ///< Used to request that the class specific implementation of `TObject::Write`
///< just prepare the objects to be ready to be written but do not actually write
///< them into the TBuffer. This is just for example by TBufferMerger to request
///< that the TTree inside the file calls `TTree::FlushBaskets` (outside of the merging lock)
///< and TBufferMerger will later ask for the write (inside the merging lock).
///< To take advantage of this feature the class needs to overload `TObject::Write`
///< and use this enum value accordingly. (See `TTree::Write` and `TObject::Write`)
- kOnlyPrepStep = BIT(3)
+ ///< Do not use, this feature will be migrate to the Merge function (See TClass and TTree::Merge)
+ kOnlyPrepStep = BIT(3)
};
+public:
+
TObject();
TObject(const TObject &object);
TObject &operator=(const TObject &rhs);
--
GitLab