From: James Page <james.page@ubuntu.com>
Date: Wed, 29 May 2019 04:54:37 +0000 (+0100)
Subject: common: avoid use of size_t in options
X-Git-Tag: v15.1.0~2611^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28277%2Fhead;p=ceph.git

common: avoid use of size_t in options

On 32 bit architectures size_t is not a 64 bit type
which causes comparison/assignment mismatch failures
during compilation - specifically in the handling of
legacy configuration values with boost::variant
records where size_t is not supported.

Signed-off-by: James Page <james.page@ubuntu.com>
---

diff --git a/src/common/config_values.h b/src/common/config_values.h
index de1661ad10b8..0485824bead3 100644
--- a/src/common/config_values.h
+++ b/src/common/config_values.h
@@ -50,7 +50,7 @@ public:
 #define OPTION_OPT_U32(name) uint64_t name;
 #define OPTION_OPT_U64(name) uint64_t name;
 #define OPTION_OPT_UUID(name) uuid_d name;
-#define OPTION_OPT_SIZE(name) size_t name;
+#define OPTION_OPT_SIZE(name) uint64_t name;
 #define OPTION(name, ty)       \
   public:                      \
     OPTION_##ty(name)