Skip to content

Commit 9724eae

Browse files
eguiraudguitargeek
eguiraud
authored and
guitargeek
committed
[IO] Deprecate historical copies of ROOT::ESTLtype
A few classes have redundant declarations of `ESTLType` or `ESTLtype` enums, that over time have been centralized in `ROOT::ESTLType`. This patch deprecates usage of the historical copies in favor of the common `ROOT::ESTLType`.
1 parent 06bd32f commit 9724eae

3 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎core/foundation/inc/TClassEdit.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,22 @@ namespace TClassEdit {
9191
kDropHash = 1<<13 /* Drop the hash if applies to the collection */
9292
};
9393

94-
enum ESTLType {
95-
kNotSTL = ROOT::kNotSTL,
96-
kVector = ROOT::kSTLvector,
97-
kList = ROOT::kSTLlist,
98-
kForwardlist = ROOT::kSTLforwardlist,
99-
kDeque = ROOT::kSTLdeque,
100-
kMap = ROOT::kSTLmap,
101-
kMultiMap = ROOT::kSTLmultimap,
102-
kSet = ROOT::kSTLset,
103-
kMultiSet = ROOT::kSTLmultiset,
104-
kUnorderedSet = ROOT::kSTLunorderedset,
105-
kUnorderedMultiSet = ROOT::kSTLunorderedmultiset,
106-
kUnorderedMap = ROOT::kSTLunorderedmap,
107-
kUnorderedMultiMap = ROOT::kSTLunorderedmultimap,
108-
kBitSet = ROOT::kSTLbitset,
109-
kEnd = ROOT::kSTLend
94+
enum R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") ESTLType {
95+
kNotSTL R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kNotSTL,
96+
kVector R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
97+
kList R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
98+
kForwardlist R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
99+
kDeque R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
100+
kMap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
101+
kMultiMap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
102+
kSet R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
103+
kMultiSet R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
104+
kUnorderedSet R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
105+
kUnorderedMultiSet R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
106+
kUnorderedMap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
107+
kUnorderedMultiMap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
108+
kBitSet R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLbitset,
109+
kEnd R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLend
110110
};
111111

112112
enum class EComplexType : short {

‎core/meta/inc/TDictionary.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -195,21 +195,21 @@ class TDictionary : public TNamed {
195195
static TDictionary* GetDictionary(const std::type_info &typeinfo);
196196

197197
// Type of STL container (returned by IsSTLContainer).
198-
enum ESTLType {
199-
kNone = ROOT::kNotSTL,
200-
kVector = ROOT::kSTLvector,
201-
kList = ROOT::kSTLlist,
202-
kForwardlist = ROOT::kSTLforwardlist,
203-
kDeque = ROOT::kSTLdeque,
204-
kMap = ROOT::kSTLmap,
205-
kMultimap = ROOT::kSTLmultimap,
206-
kSet = ROOT::kSTLset,
207-
kMultiset = ROOT::kSTLmultiset,
208-
kUnorderedSet = ROOT::kSTLunorderedset,
209-
kUnorderedMultiset = ROOT::kSTLunorderedmultiset,
210-
kUnorderedMap = ROOT::kSTLunorderedmap,
211-
kUnorderedMultimap = ROOT::kSTLunorderedmultimap,
212-
kBitset = ROOT::kSTLbitset
198+
enum R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") ESTLType {
199+
kNone R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kNotSTL,
200+
kVector R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
201+
kList R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
202+
kForwardlist R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
203+
kDeque R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
204+
kMap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
205+
kMultimap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
206+
kSet R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
207+
kMultiset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
208+
kUnorderedSet R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
209+
kUnorderedMultiset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
210+
kUnorderedMap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
211+
kUnorderedMultimap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
212+
kBitset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLbitset
213213
};
214214

215215
/// Kinds of members to include in lists.

‎core/meta/inc/TStreamerElement.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ class TStreamerElement : public TNamed {
4949

5050
public:
5151

52-
enum ESTLtype {
53-
kSTL = ROOT::kSTLany,
54-
kSTLstring = ROOT::kSTLstring,
55-
kSTLvector = ROOT::kSTLvector,
56-
kSTLlist = ROOT::kSTLlist,
57-
kSTLforwardlist = ROOT::kSTLforwardlist,
58-
kSTLdeque = ROOT::kSTLdeque,
59-
kSTLmap = ROOT::kSTLmap,
60-
kSTLmultimap = ROOT::kSTLmultimap,
61-
kSTLset = ROOT::kSTLset,
62-
kSTLmultiset = ROOT::kSTLmultiset,
63-
kSTLunorderedset = ROOT::kSTLunorderedset,
64-
kSTLunorderedmultiset = ROOT::kSTLunorderedmultiset,
65-
kSTLunorderedmap = ROOT::kSTLunorderedmap,
66-
kSTLunorderedmultimap = ROOT::kSTLunorderedmultimap,
67-
kSTLbitset = ROOT::kSTLbitset
52+
enum R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") ESTLtype {
53+
kSTL R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLany,
54+
kSTLstring R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLstring,
55+
kSTLvector R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
56+
kSTLlist R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
57+
kSTLforwardlist R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
58+
kSTLdeque R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
59+
kSTLmap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
60+
kSTLmultimap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
61+
kSTLset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
62+
kSTLmultiset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
63+
kSTLunorderedset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
64+
kSTLunorderedmultiset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
65+
kSTLunorderedmap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
66+
kSTLunorderedmultimap R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
67+
kSTLbitset R__DEPRECATED(6, 40, "Please use ROOT::ESTLType instead.") = ROOT::kSTLbitset
6868
};
6969
// TStreamerElement status bits
7070
enum EStatusBits {

0 commit comments

Comments
 (0)