From 5416b1fb2279af92a73e253d3c2951ae572b443b Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 30 Jul 2015 16:29:55 -0400 Subject: [PATCH] c++11: fixes for std::pair type conversions mds_rank_t is no longer a BOOST_STRONG_TYPEDEF, because that was preventing the conversion between pairs of int and pairs of mds_rank_t Signed-off-by: Casey Bodley --- src/common/ceph_json.h | 2 +- src/mds/mdstypes.h | 2 +- src/rgw/rgw_cache.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/ceph_json.h b/src/common/ceph_json.h index 4bc0b9a863a..e69055b1611 100644 --- a/src/common/ceph_json.h +++ b/src/common/ceph_json.h @@ -198,7 +198,7 @@ void decode_json_obj(multimap& m, JSONObj *obj) JSONObj *o = *iter; JSONDecoder::decode_json("key", key, o); JSONDecoder::decode_json("val", val, o); - m.insert(make_pair(key, val)); + m.insert(make_pair(key, val)); } } diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h index fbba7887d73..e0a421fdd85 100644 --- a/src/mds/mdstypes.h +++ b/src/mds/mdstypes.h @@ -74,7 +74,7 @@ #define MDS_TRAVERSE_DISCOVERXLOCK 3 // succeeds on (foreign?) null, xlocked dentries. -BOOST_STRONG_TYPEDEF(int32_t, mds_rank_t) +typedef int32_t mds_rank_t; BOOST_STRONG_TYPEDEF(uint64_t, mds_gid_t) extern const mds_gid_t MDS_GID_NONE; extern const mds_rank_t MDS_RANK_NONE; diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc index c3f3b06ffc8..03c3b050e3f 100644 --- a/src/rgw/rgw_cache.cc +++ b/src/rgw/rgw_cache.cc @@ -105,7 +105,7 @@ bool ObjectCache::chain_cache_entry(list& cache_info_ent for (liter = cache_entry_list.begin(); liter != cache_entry_list.end(); ++liter) { ObjectCacheEntry *entry = *liter; - entry->chained_entries.push_back(make_pair(chained_entry->cache, chained_entry->key)); + entry->chained_entries.push_back(make_pair(chained_entry->cache, chained_entry->key)); } return true;