From: Noah Watkins <noahwatkins@gmail.com>
Date: Thu, 23 Jan 2014 15:20:42 +0000 (-0800)
Subject: osd: use ceph:: scoped hash_map
X-Git-Tag: v0.78~284^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f8541c8da5a3eee42253e1710a0c1b53e5af4f3;p=ceph.git

osd: use ceph:: scoped hash_map

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

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<hobject_t, pg_log_entry_t*>::const_iterator i =
+    ceph::unordered_map<hobject_t, pg_log_entry_t*>::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<hobject_t, pg_log_entry_t*>::const_iterator objiter =
+  ceph::unordered_map<hobject_t, pg_log_entry_t*>::const_iterator objiter =
     log.objects.find(oe.soid);
   if (objiter != log.objects.end()) {
     pg_log_entry_t &ne = *(objiter->second); // new(er?) entry