From 3593233f35fd8ff0bf183af057a8d30427ac2185 Mon Sep 17 00:00:00 2001 From: Jos Collin Date: Wed, 14 Jun 2017 20:34:44 +0530 Subject: [PATCH] test/mon: silence warnings from -Wreorder MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The following warning appears during make: ceph/src/test/mon/test-mon-msg.cc: In constructor ‘MonMsgTest::MonMsgTest()’: ceph/src/test/mon/test-mon-msg.cc:222:12: warning: ‘MonMsgTest::reply_msg’ will be initialized after [-Wreorder] Message *reply_msg; ^~~~~~~~~ ceph/src/test/mon/test-mon-msg.cc:229:16: warning: base ‘MonClientHelper’ [-Wreorder] lock("lock") { } ^ ceph/src/test/mon/test-mon-msg.cc:226:3: warning: when initialized here [-Wreorder] MonMsgTest() : Signed-off-by: Jos Collin --- src/test/mon/test-mon-msg.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc index 7de767c1c3e..a372ff60279 100644 --- a/src/test/mon/test-mon-msg.cc +++ b/src/test/mon/test-mon-msg.cc @@ -219,12 +219,11 @@ class MonMsgTest : public MonClientHelper, { protected: int reply_type; - Message *reply_msg; + Message *reply_msg = nullptr; Mutex lock; Cond cond; MonMsgTest() : - reply_msg(NULL), MonClientHelper(g_ceph_context), lock("lock") { } @@ -233,7 +232,7 @@ public: reply_type = -1; if (reply_msg) { reply_msg->put(); - reply_msg = NULL; + reply_msg = nullptr; } ASSERT_EQ(init(), 0); } @@ -242,7 +241,7 @@ public: shutdown(); if (reply_msg) { reply_msg->put(); - reply_msg = NULL; + reply_msg = nullptr; } } @@ -280,7 +279,7 @@ public: } if (!reply_msg) - dout(20) << __func__ << " reply_msg is NULL" << dendl; + dout(20) << __func__ << " reply_msg is nullptr" << dendl; else dout(20) << __func__ << " reply_msg " << *reply_msg << dendl; return reply_msg; -- 2.47.3