From: robertc <>
Date: Thu, 6 Jan 2005 10:22:22 +0000 (+0000)
Subject: mark Store::Root() as inline, and remove a duplicate store lookup from neighbours.cc
X-Git-Tag: SQUID_3_0_PRE4~917
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88e133928ccb267652a977f35a1af453840df592;p=thirdparty%2Fsquid.git

mark Store::Root() as inline, and remove a duplicate store lookup from neighbours.cc
---

diff --git a/src/Store.h b/src/Store.h
index ea886e7860..01b29e6994 100644
--- a/src/Store.h
+++ b/src/Store.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Store.h,v 1.14 2005/01/03 16:08:25 robertc Exp $
+ * $Id: Store.h,v 1.15 2005/01/06 03:22:22 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -179,7 +179,7 @@ class Store : public RefCountable
 
 public:
     /* The root store */
-    static Store &Root();
+    static _SQUID_INLINE_ Store &Root();
     static void Root(Store *);
     static void Root(RefCount<Store>);
     static void Stats(StoreEntry * output);
diff --git a/src/neighbors.cc b/src/neighbors.cc
index ceee7f98fa..ca876d8665 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.327 2005/01/05 21:59:34 serassio Exp $
+ * $Id: neighbors.cc,v 1.328 2005/01/06 03:22:22 robertc Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -1771,7 +1771,7 @@ neighborsHtcpReply(const cache_key * key, htcpReplyData * htcp, const struct soc
     debug(15, 6) ("neighborsHtcpReply: %s %s\n",
                   htcp->hit ? "HIT" : "MISS", storeKeyText(key));
 
-    if (NULL != (e = Store::Root().get(key)))
+    if (NULL != e)
         mem = e->mem_obj;
 
     if ((p = whichPeer(from)))