From: Kefu Chai <kchai@redhat.com>
Date: Mon, 22 Apr 2019 14:08:15 +0000 (+0800)
Subject: crush,msg: silence -Wsign-compare warnings
X-Git-Tag: v15.1.0~2853^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=779419a7451d0e854f887a8b7eff2cddd1cce3b3;p=ceph.git

crush,msg: silence -Wsign-compare warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index ce3ddf3b3add..eddf944362db 100644
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -968,7 +968,7 @@ public:
 
   int validate_weightf(float weight) {
     uint64_t iweight = weight * 0x10000;
-    if (iweight > std::numeric_limits<int>::max()) {
+    if (iweight > static_cast<uint64_t>(std::numeric_limits<int>::max())) {
       return -EOVERFLOW;
     }
     return 0;
diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
index 887976745368..edc75ab2922f 100644
--- a/src/msg/async/ProtocolV1.cc
+++ b/src/msg/async/ProtocolV1.cc
@@ -863,7 +863,8 @@ CtPtr ProtocolV1::handle_message_data(char *buffer, int r) {
 
   bufferptr bp = data_blp.get_current_ptr();
   unsigned read_len = std::min(bp.length(), msg_left);
-  ceph_assert(read_len < std::numeric_limits<int>::max());
+  ceph_assert(read_len <
+	      static_cast<unsigned>(std::numeric_limits<int>::max()));
   data_blp.advance(read_len);
   data.append(bp, 0, read_len);
   msg_left -= read_len;