RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

c++11: fixes for std::pair type conversions

Browse Source 
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 <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2015-07-30 16:29:55 -04:00
parent 3f52583484
commit 5416b1fb22
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/ceph_json.h
View File

@ -198,7 +198,7 @@ void decode_json_obj(multimap<K, V>& m, JSONObj *obj)
JSONObj *o = *iter;
JSONDecoder::decode_json("key", key, o);
JSONDecoder::decode_json("val", val, o);
m.insert(make_pair<K, V>(key, val));
m.insert(make_pair(key, val));
}
}

2
src/mds/mdstypes.h
View File

@ -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;

2
src/rgw/rgw_cache.cc
View File

@ -105,7 +105,7 @@ bool ObjectCache::chain_cache_entry(list<rgw_cache_entry_info *>& 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<RGWChainedCache *, string>(chained_entry->cache, chained_entry->key));
entry->chained_entries.push_back(make_pair(chained_entry->cache, chained_entry->key));
}
return true;