From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Fri, 14 Dec 2012 11:11:16 +0000 (+0200)
Subject: cert validation cache: Fixes to LruMap template class to build on amd64-CentOS-5.3
X-Git-Tag: SQUID_3_4_0_1~441
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9aea094e340645a8d86dd0b07f687ef1fcd5d526;p=thirdparty%2Fsquid.git

cert validation cache: Fixes to LruMap template class to build on amd64-CentOS-5.3
---

diff --git a/src/base/LruMap.h b/src/base/LruMap.h
index a5888baffb..f018b70b41 100644
--- a/src/base/LruMap.h
+++ b/src/base/LruMap.h
@@ -110,7 +110,7 @@ LruMap<EntryValue, EntryCost>::findEntry(const char *key, LruMap::MapIterator &i
     index.erase(i->second);
     i->second = index.begin();
 
-    LruMap::Entry *e = *i->second;
+    Entry *e = *i->second;
 
     if (e && expired(*e)) {
         del(i);
@@ -122,9 +122,9 @@ template <class EntryValue, size_t EntryCost>
 EntryValue *
 LruMap<EntryValue, EntryCost>::get(const char *key)
 {
-    LruMap::MapIterator i;
+    MapIterator i;
     findEntry(key, i);
-    LruMap::Entry *e = *i->second;
+    Entry *e = *i->second;
     if (i != storage.end()) {
         touch(i);
         return e->value;
@@ -176,7 +176,7 @@ template <class EntryValue, size_t EntryCost>
 bool
 LruMap<EntryValue, EntryCost>::del(const char *key)
 {
-    LruMap::MapIterator i;
+    MapIterator i;
     findEntry(key, i);
     return del(i);
 }
@@ -186,7 +186,7 @@ void
 LruMap<EntryValue, EntryCost>::trim()
 {
     while (memLimit() > 0 && size() >= memLimit()) {
-        LruMap::QueueIterator i = index.end();
+        QueueIterator i = index.end();
         --i;
         if (i != index.end()) {
             del((*i)->key.c_str());