From: Ceph Packaging Team <team+ceph@tracker.debian.org>
Date: Tue, 7 Jan 2020 19:50:28 +0000 (+0000)
Subject: bit-avoid-overloading
X-Git-Tag: archive/raspbian/14.2.5-3+rpi1~6^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d3ad1eff02dbe546463b5a189bd46e740660583d;p=ceph.git

bit-avoid-overloading


Gbp-Pq: Name 32bit-avoid-overloading.patch
---

diff --git a/src/include/buffer.h b/src/include/buffer.h
index b8c78210e..e1d377297 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -737,7 +737,12 @@ inline namespace v14_2_0 {
 
       void advance(int o) = delete;
       void advance(unsigned o);
+
+// unsigned and size_t are equivalent on 32bit architectures.
+// so casting is only needed when not on 32bit.
+#if defined(UINTPTR_MAX) && UINTPTR_MAX > 0xffffffff
       void advance(size_t o) { advance(static_cast<unsigned>(o)); }
+#endif
       void seek(unsigned o);
       char operator*() const;
       iterator_impl& operator++();