Skip to content

Commit e7d46b7

Browse files
committed
[core] Change RInvalidField::RCategory deprecation to 6.42
1 parent 14fb596 commit e7d46b7

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

core/foundation/inc/ROOT/RConfig.hxx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,14 @@
491491
#define _R__DEPRECATED_640(REASON) _R_DEPRECATED_REMOVE_NOW(REASON)
492492
#endif
493493

494+
/* USE AS `R__DEPRECATED(6,42, "Not threadsafe; use TFoo::Bar().")`
495+
To be removed by 6.42 */
496+
#if ROOT_VERSION_CODE <= ROOT_VERSION(6, 41, 0)
497+
#define _R__DEPRECATED_642(REASON) _R__DEPRECATED_LATER(REASON)
498+
#else
499+
#define _R__DEPRECATED_642(REASON) _R_DEPRECATED_REMOVE_NOW(REASON)
500+
#endif
501+
494502
/* USE AS `R__DEPRECATED(7,00, "Not threadsafe; use TFoo::Bar().")`
495503
To be removed by 7.00 */
496504
#if ROOT_VERSION_CODE < ROOT_VERSION(6,99,0)

tree/ntuple/inc/ROOT/RField.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public:
8282
kUnknownStructure,
8383
};
8484

85-
using RCategory R__DEPRECATED(6, 40, "enum renamed to ECategory") = ECategory;
85+
using RCategory R__DEPRECATED(6, 42, "enum renamed to ECategory") = ECategory;
8686

8787
private:
8888
std::string fError;

0 commit comments

Comments
 (0)