|
@@ -10,14 +10,14 @@
|
|
|
#define CEPH_FEATURE_INCARNATION_2 (1ull<<57) // CEPH_FEATURE_SERVER_JEWEL
|
|
|
|
|
|
#define DEFINE_CEPH_FEATURE(bit, incarnation, name) \
|
|
|
- const static uint64_t CEPH_FEATURE_##name = (1ULL<<bit); \
|
|
|
- const static uint64_t CEPH_FEATUREMASK_##name = \
|
|
|
+ static const uint64_t CEPH_FEATURE_##name = (1ULL<<bit); \
|
|
|
+ static const uint64_t CEPH_FEATUREMASK_##name = \
|
|
|
(1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);
|
|
|
|
|
|
/* this bit is ignored but still advertised by release *when* */
|
|
|
#define DEFINE_CEPH_FEATURE_DEPRECATED(bit, incarnation, name, when) \
|
|
|
- const static uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \
|
|
|
- const static uint64_t DEPRECATED_CEPH_FEATUREMASK_##name = \
|
|
|
+ static const uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \
|
|
|
+ static const uint64_t DEPRECATED_CEPH_FEATUREMASK_##name = \
|
|
|
(1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);
|
|
|
|
|
|
/*
|