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 ea886e786079923489bc3f83ab06494021176ead..01b29e6994c3ceefc6b1d4933d25a21ffa33857d 100644 (file)
--- 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 ceee7f98fa0f82f865dc2b2db8e492ba200cb2e1..ca876d8665d164e6e23cdcd910330de7dcf225cb 100644 (file)
--- 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)))