]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
memstore: fix the build on i386
authorKefu Chai <kchai@redhat.com>
Wed, 2 Sep 2015 09:20:36 +0000 (17:20 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 2 Sep 2015 09:23:22 +0000 (17:23 +0800)
on i386, uint64 is `unsigned long long`, while size_t is `unsigned int`.
std::min(uint64, size_t) can not be resolved.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/os/MemStore.cc

index a098f315994f7f687a494f75a141221460ae893d..9b0d994dd8c6e53e78632c91fad05e50d7afd287 100644 (file)
@@ -1511,7 +1511,7 @@ int MemStore::PageSetObject::clone(Object *src, uint64_t srcoff,
   const int64_t delta = dstoff - srcoff;
 
   auto &src_data = static_cast<PageSetObject*>(src)->data;
-  const auto src_page_size = src_data.get_page_size();
+  const uint64_t src_page_size = src_data.get_page_size();
 
   auto &dst_data = data;
   const auto dst_page_size = dst_data.get_page_size();