Skip to content

Commit 49500cf

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 840f3dd commit 49500cf

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
@@ -90,22 +90,22 @@ namespace TClassEdit {
9090
kDropHash = 1<<13 /* Drop the hash if applies to the collection */
9191
};
9292

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

111111
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, 34, "Please use ROOT::ESTLType instead.") ESTLType {
199+
kNone R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kNotSTL,
200+
kVector R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
201+
kList R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
202+
kForwardlist R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
203+
kDeque R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
204+
kMap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
205+
kMultimap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
206+
kSet R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
207+
kMultiset R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
208+
kUnorderedSet R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
209+
kUnorderedMultiset R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
210+
kUnorderedMap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
211+
kUnorderedMultimap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
212+
kBitset R__DEPRECATED(6, 34, "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
@@ -54,22 +54,22 @@ class TStreamerElement : public TNamed {
5454

5555
public:
5656

57-
enum ESTLtype {
58-
kSTL = ROOT::kSTLany,
59-
kSTLstring = ROOT::kSTLstring,
60-
kSTLvector = ROOT::kSTLvector,
61-
kSTLlist = ROOT::kSTLlist,
62-
kSTLforwardlist = ROOT::kSTLforwardlist,
63-
kSTLdeque = ROOT::kSTLdeque,
64-
kSTLmap = ROOT::kSTLmap,
65-
kSTLmultimap = ROOT::kSTLmultimap,
66-
kSTLset = ROOT::kSTLset,
67-
kSTLmultiset = ROOT::kSTLmultiset,
68-
kSTLunorderedset = ROOT::kSTLunorderedset,
69-
kSTLunorderedmultiset = ROOT::kSTLunorderedmultiset,
70-
kSTLunorderedmap = ROOT::kSTLunorderedmap,
71-
kSTLunorderedmultimap = ROOT::kSTLunorderedmultimap,
72-
kSTLbitset = ROOT::kSTLbitset
57+
enum R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") ESTLtype {
58+
kSTL R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLany,
59+
kSTLstring R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLstring,
60+
kSTLvector R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLvector,
61+
kSTLlist R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLlist,
62+
kSTLforwardlist R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLforwardlist,
63+
kSTLdeque R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLdeque,
64+
kSTLmap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmap,
65+
kSTLmultimap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultimap,
66+
kSTLset R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLset,
67+
kSTLmultiset R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLmultiset,
68+
kSTLunorderedset R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedset,
69+
kSTLunorderedmultiset R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultiset,
70+
kSTLunorderedmap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmap,
71+
kSTLunorderedmultimap R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLunorderedmultimap,
72+
kSTLbitset R__DEPRECATED(6, 34, "Please use ROOT::ESTLType instead.") = ROOT::kSTLbitset
7373
};
7474
// TStreamerElement status bits
7575
enum EStatusBits {

0 commit comments

Comments
 (0)