From: Sage Weil <sage@redhat.com>
Date: Mon, 17 Aug 2015 14:29:48 +0000 (-0400)
Subject: osd/OSDMap: test_flag returns bool
X-Git-Tag: v9.1.0~346^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5470%2Fhead;p=ceph.git

osd/OSDMap: test_flag returns bool

Otherwise comparing the result to a bool will promote the bool to
an int and fail the comparison.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 3e75995da10..e1d140adf0e 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -341,7 +341,7 @@ public:
   }
 
   int get_flags() const { return flags; }
-  int test_flag(int f) const { return flags & f; }
+  bool test_flag(int f) const { return flags & f; }
   void set_flag(int f) { flags |= f; }
   void clear_flag(int f) { flags &= ~f; }