From 37ca6bef8720b912cff3275d7ca83d91634a4efb Mon Sep 17 00:00:00 2001
From: Yao Zongyou <yaozongyou@vip.qq.com>
Date: Tue, 23 Oct 2018 12:52:46 +0800
Subject: [PATCH] common: prefer std::size to ARRAY_SIZE macro

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
---
 src/common/cmdparse.h | 3 ---
 src/mon/Monitor.cc    | 5 +++--
 src/osd/OSD.cc        | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h
index ee3844fb8fbd..487883e1a4b8 100644
--- a/src/common/cmdparse.h
+++ b/src/common/cmdparse.h
@@ -13,9 +13,6 @@
 
 class CephContext;
 
-/* this is handy; can't believe it's not standard */
-#define ARRAY_SIZE(a)	(sizeof(a) / sizeof(*a))
-
 typedef boost::variant<std::string,
 		       bool,
 		       int64_t,
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 096b1e0a8892..485b433fa60c 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -13,6 +13,7 @@
  */
 
 
+#include <iterator>
 #include <sstream>
 #include <tuple>
 #include <stdlib.h>
@@ -214,8 +215,8 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
   exited_quorum = ceph_clock_now();
 
   // prepare local commands
-  local_mon_commands.resize(ARRAY_SIZE(mon_commands));
-  for (unsigned i = 0; i < ARRAY_SIZE(mon_commands); ++i) {
+  local_mon_commands.resize(std::size(mon_commands));
+  for (unsigned i = 0; i < std::size(mon_commands); ++i) {
     local_mon_commands[i] = mon_commands[i];
   }
   MonCommand::encode_vector(local_mon_commands, local_mon_commands_bl);
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 18faaca55c87..35eef0846e65 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -18,6 +18,7 @@
 #include <cctype>
 #include <fstream>
 #include <iostream>
+#include <iterator>
 
 #include <unistd.h>
 #include <sys/stat.h>
@@ -6090,7 +6091,7 @@ int OSD::_do_command(
     JSONFormatter *f = new JSONFormatter();
     f->open_object_section("command_descriptions");
     for (OSDCommand *cp = osd_commands;
-	 cp < &osd_commands[ARRAY_SIZE(osd_commands)]; cp++) {
+	 cp < &osd_commands[std::size(osd_commands)]; cp++) {
 
       ostringstream secname;
       secname << "cmd" << setfill('0') << std::setw(3) << cmdnum;
-- 
2.47.3