[Pkg-ceph-commits] [ceph] 41/59: d/p/32bit-compat-service-daemon.patch: Fix implicit type conversion for Boost variant types on 32 bit architectures (LP: #1709396).

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit a3405f1177733983188fccf4a64fc32b78fa8513
Author: James Page <james.page at ubuntu.com>
Date:   Wed Aug 9 09:44:53 2017 +0100

    d/p/32bit-compat-service-daemon.patch: Fix implicit type conversion for Boost variant types on 32 bit architectures (LP: #1709396).
---
 debian/changelog                                 |  2 ++
 debian/patches/32bit-compat-service-daemon.patch | 22 ++++++++++++++++++++++
 debian/patches/series                            |  3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 707d354..5d47990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ceph (12.1.2-0ubuntu2) UNRELEASED; urgency=medium
 
   * d/p/rocksdb-fallthrough-i386.patch: Mark intentional fallthroughs
     for compatibility with gcc-7.
+  * d/p/32bit-compat-service-daemon.patch: Fix implicit type conversion
+    for Boost variant types on 32 bit architectures (LP: #1709396).
 
  -- James Page <james.page at ubuntu.com>  Tue, 08 Aug 2017 11:21:04 +0100
 
diff --git a/debian/patches/32bit-compat-service-daemon.patch b/debian/patches/32bit-compat-service-daemon.patch
new file mode 100644
index 0000000..686e9de
--- /dev/null
+++ b/debian/patches/32bit-compat-service-daemon.patch
@@ -0,0 +1,22 @@
+Description: Resolve build failures on 32bit archs
+ size_t is an unsigned 32bit integer on 32bit archs which
+ does not unambiguously convert to a uint64_t or bool as
+ detailed in the service_daemon Attribute type.
+Author: James Page <james.page at ubuntu.com>
+Forwareded: no
+
+--- a/src/tools/rbd_mirror/InstanceReplayer.cc
++++ b/src/tools/rbd_mirror/InstanceReplayer.cc
+@@ -372,9 +372,9 @@ void InstanceReplayer<I>::start_image_re
+     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) {
+     ++image_count;
+     auto health_state = it.second->get_health_state();
diff --git a/debian/patches/series b/debian/patches/series
index ed76d99..3aa855a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 # Ubuntu: i386 build failure
-rocksdb-fallthrough-i386.patch
 0001-CoreLocalArray-class.patch
 0002-core-local-array-type-conversions.patch
 0003-Core-local-statistics.patch
 # Ubuntu: rocksdb/i386/gcc-7 compat
+rocksdb-fallthrough-i386.patch
+32bit-compat-service-daemon.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git