From 022e705f87bf58c02051959f87ac953a3376ccf7 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Wed, 23 Apr 2014 16:09:28 +0200 Subject: [PATCH] SimpleLock.h: fix bool comparison using relational operator [src/mds/SimpleLock.h:287]: (warning) Comparison of a boolean value using relational operator (<, >, <= or >=). Signed-off-by: Danny Al-Gaaf --- src/mds/SimpleLock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h index cbaa9964e1be2..2cfc99997ddf3 100644 --- a/src/mds/SimpleLock.h +++ b/src/mds/SimpleLock.h @@ -284,8 +284,8 @@ public: struct ptr_lt { bool operator()(const SimpleLock* l, const SimpleLock* r) const { // first sort by object type (dn < inode) - if ((l->type->type>CEPH_LOCK_DN) < (r->type->type>CEPH_LOCK_DN)) return true; - if ((l->type->type>CEPH_LOCK_DN) == (r->type->type>CEPH_LOCK_DN)) { + if (!(l->type->type > CEPH_LOCK_DN) && (r->type->type > CEPH_LOCK_DN)) return true; + if ((l->type->type > CEPH_LOCK_DN) == (r->type->type > CEPH_LOCK_DN)) { // then sort by object if (l->parent->is_lt(r->parent)) return true; if (l->parent == r->parent) { -- 2.39.5