From 6f8541c8da5a3eee42253e1710a0c1b53e5af4f3 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Thu, 23 Jan 2014 07:20:42 -0800 Subject: [PATCH] osd: use ceph:: scoped hash_map Signed-off-by: Noah Watkins --- src/osd/PGLog.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index 06795dcb414d..e845bd6a26e7 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -18,6 +18,7 @@ #include "PGLog.h" #include "PG.h" #include "SnapMapper.h" +#include "../include/unordered_map.h" #define dout_subsys ceph_subsys_osd @@ -183,7 +184,7 @@ void PGLog::proc_replica_log(ObjectStore::Transaction& t, break; } - hash_map::const_iterator i = + ceph::unordered_map::const_iterator i = log.objects.find(oe.soid); if (i != log.objects.end() && i->second->version == oe.version) { dout(10) << " had " << oe << " new " << *(i->second) @@ -253,7 +254,7 @@ bool PGLog::_merge_old_entry( << " : beyond last_backfill" << dendl; return false; } - hash_map::const_iterator objiter = + ceph::unordered_map::const_iterator objiter = log.objects.find(oe.soid); if (objiter != log.objects.end()) { pg_log_entry_t &ne = *(objiter->second); // new(er?) entry -- 2.47.3