update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / common / ceph_releases.h

diff --git a/ceph/src/common/ceph_releases.h b/ceph/src/common/ceph_releases.h
index f5daef6bf07d0d7d11e0d3f63696debac53df5d5..96fba92fddd01553e95b502d845362b7b167a08f 100644 (file)
--- a/ceph/src/common/ceph_releases.h
+++ b/ceph/src/common/ceph_releases.h
@@ -27,27 +27,28 @@ enum class ceph_release_t : std::uint8_t {
   mimic,
   nautilus,
   octopus,
+  pacific,
   max,
 };
 
 std::ostream& operator<<(std::ostream& os, const ceph_release_t r);
 
-static inline bool operator!(ceph_release_t& r) {
+inline bool operator!(ceph_release_t& r) {
   return (r < ceph_release_t::unknown ||
           r == ceph_release_t::unknown);
 }
 
-static inline ceph_release_t& operator--(ceph_release_t& r) {
+inline ceph_release_t& operator--(ceph_release_t& r) {
   r = static_cast<ceph_release_t>(static_cast<uint8_t>(r) - 1);
   return r;
 }
 
-static inline ceph_release_t& operator++(ceph_release_t& r) {
+inline ceph_release_t& operator++(ceph_release_t& r) {
   r = static_cast<ceph_release_t>(static_cast<uint8_t>(r) + 1);
   return r;
 }
 
-static inline bool operator<(ceph_release_t lhs, ceph_release_t rhs) {
+inline bool operator<(ceph_release_t lhs, ceph_release_t rhs) {
   // we used to use -1 for invalid release
   if (static_cast<int8_t>(lhs) < 0) {
     return true;
@@ -57,7 +58,7 @@ static inline bool operator<(ceph_release_t lhs, ceph_release_t rhs) {
   return static_cast<uint8_t>(lhs) < static_cast<uint8_t>(rhs);
 }
 
-static inline bool operator>(ceph_release_t lhs, ceph_release_t rhs) {
+inline bool operator>(ceph_release_t lhs, ceph_release_t rhs) {
   // we used to use -1 for invalid release
   if (static_cast<int8_t>(lhs) < 0) {
     return false;
@@ -67,7 +68,7 @@ static inline bool operator>(ceph_release_t lhs, ceph_release_t rhs) {
   return static_cast<uint8_t>(lhs) > static_cast<uint8_t>(rhs);
 }
 
-static inline bool operator>=(ceph_release_t lhs, ceph_release_t rhs) {
+inline bool operator>=(ceph_release_t lhs, ceph_release_t rhs) {
   return !(lhs < rhs);
 }
 
@@ -78,12 +79,9 @@ bool can_upgrade_from(ceph_release_t from_release,
 ceph_release_t ceph_release_from_name(std::string_view sv);
 ceph_release_t ceph_release();
 
-namespace ceph
-{
-  static inline std::string_view to_string(ceph_release_t r) {
-    return ceph_release_name(static_cast<int>(r));
-  }
-  template<typename IntType> IntType to_integer(ceph_release_t r) {
-    return static_cast<IntType>(r);
-  }
+inline std::string_view to_string(ceph_release_t r) {
+  return ceph_release_name(static_cast<int>(r));
+}
+template<typename IntType> IntType to_integer(ceph_release_t r) {
+  return static_cast<IntType>(r);
 }