From 1560f5bcdbd93977f5c81e5c9690a417fc17a70e Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 9 Aug 2017 10:04:37 +0100 Subject: [PATCH] Align use of uint64_t in service_daemon::AttributeType size_t on a 32-bit architecture is a 32 bit unsigned int which created ambiguity when casting to bool, uint64_t or std::string (which are boost::variants for service_daemon::AttributeType). Align to use of uint64_t to resolve compilation failures in all 32-bit architectures. Signed-off-by: James Page (cherry picked from commit 87fe8e81bc8c9b55c6bef4144714a33e042dc2f7) --- src/tools/rbd_mirror/InstanceReplayer.cc | 6 +++--- src/tools/rbd_mirror/PoolWatcher.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/rbd_mirror/InstanceReplayer.cc b/src/tools/rbd_mirror/InstanceReplayer.cc index 097007231badf..52e60605c758e 100644 --- a/src/tools/rbd_mirror/InstanceReplayer.cc +++ b/src/tools/rbd_mirror/InstanceReplayer.cc @@ -333,9 +333,9 @@ void InstanceReplayer::start_image_replayers(int r) { return; } - size_t image_count = 0; - size_t warning_count = 0; - size_t error_count = 0; + uint64_t image_count = 0; + uint64_t warning_count = 0; + uint64_t error_count = 0; for (auto it = m_image_replayers.begin(); it != m_image_replayers.end();) { auto current_it(it); diff --git a/src/tools/rbd_mirror/PoolWatcher.h b/src/tools/rbd_mirror/PoolWatcher.h index 51ee00e9add84..9a02bad4bd83a 100644 --- a/src/tools/rbd_mirror/PoolWatcher.h +++ b/src/tools/rbd_mirror/PoolWatcher.h @@ -52,7 +52,7 @@ public: void init(Context *on_finish = nullptr); void shut_down(Context *on_finish); - inline size_t get_image_count() const { + inline uint64_t get_image_count() const { Mutex::Locker locker(m_lock); return m_image_ids.size(); } -- 2.39.5