From: Kefu Chai <kchai@redhat.com>
Date: Sat, 4 Aug 2018 14:23:55 +0000 (+0800)
Subject: osd: make OSD::HEARTBEAT_MAX_CONN inline
X-Git-Tag: v14.0.1~677^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23424%2Fhead;p=ceph.git

osd: make OSD::HEARTBEAT_MAX_CONN inline

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 5c703e448fe7..e435b99000a7 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1509,7 +1509,7 @@ private:
     utime_t last_rx_back;   ///< last time we got a ping reply on the back side
     epoch_t epoch;      ///< most recent epoch we wanted this peer
     /// number of connections we send and receive heartbeat pings/replies
-    const static int HEARTBEAT_MAX_CONN = 2;
+    static constexpr int HEARTBEAT_MAX_CONN = 2;
     /// history of inflight pings, arranging by timestamp we sent
     /// send time -> deadline -> remaining replies
     map<utime_t, pair<utime_t, int>> ping_history;