From: Sage Weil <sage@newdream.net>
Date: Wed, 7 Jun 2017 20:59:54 +0000 (-0500)
Subject: Merge pull request #15525 from wjwithagen/wip-wjw-clang-testosdmap
X-Git-Tag: v12.1.0~233
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=91c5af152ea76918303542e52f2db7dfdc8f705e;p=ceph.git

Merge pull request #15525 from wjwithagen/wip-wjw-clang-testosdmap

test: osd/TestOSDMap.cc: fix Clang complain about promotion

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

91c5af152ea76918303542e52f2db7dfdc8f705e
diff --cc src/test/osd/TestOSDMap.cc
index 9445355129718,4149ba5f5507b..300a38528c653
--- a/src/test/osd/TestOSDMap.cc
+++ b/src/test/osd/TestOSDMap.cc
@@@ -439,9 -439,9 +439,9 @@@ TEST(PGTempMap, basic
  {
    PGTempMap m;
    pg_t a(1,1);
 -  for (unsigned i=3; i<1000; ++i) {
 +  for (auto i=3; i<1000; ++i) {
      pg_t x(i, 1);
-     m.set(x, {i});
+     m.set(x, {static_cast<int>(i)});
    }
    pg_t b(2,1);
    m.set(a, {1, 2});