Summary: Remove MemPool dependence on Array.h.

Keywords:

Remove Array.h include from MemPool.h.
Add to headers that implicitly included it before.

diff --git a/include/MemPool.h b/include/MemPool.h
index 0198db30cdd2e96a4daea73efd0e31e1c215383b..abb26f9d4ef5f5e3c07973c84e2f2eba1c719c3a 100644 (file)
--- a/include/MemPool.h
+++ b/include/MemPool.h
@@ -3,12 +3,15 @@
 #define _MEM_POOLS_H_
 
 #include "config.h"
-#include "Array.h"
 #include "util.h"
 #ifdef __cplusplus
+
 template <class V>
+
 class SplayNode;
+
 typedef SplayNode<void *> splayNode;
+
 #else
 #include "splay.h"
 #endif
@@ -46,25 +49,37 @@ typedef SplayNode<void *> splayNode;
 #define MEM_MAX_FREE  65535    /* ushort is max number of items per chunk */
 
 typedef struct _MemPoolMeter MemPoolMeter;
+
 typedef struct _MemPool MemPool;
+
 typedef struct _MemChunk MemChunk;
+
 typedef struct _MemPoolStats MemPoolStats;
+
 typedef struct _MemPoolGlobalStats MemPoolGlobalStats;
+
 typedef struct _MemPoolIterator MemPoolIterator;
 
-struct _MemPoolIterator {
+struct _MemPoolIterator
+{
     MemPool *pool;
     MemPoolIterator * next;
 };
 
 /* object to track per-pool cumulative counters */
-typedef struct {
+
+typedef struct
+{
     double count;
     double bytes;
-} mgb_t;
+}
+
+mgb_t;
 
 /* object to track per-pool memory usage (alloc = inuse+idle) */
-struct _MemPoolMeter {
+
+struct _MemPoolMeter
+{
     MemMeter alloc;
     MemMeter inuse;
     MemMeter idle;
@@ -74,7 +89,9 @@ struct _MemPoolMeter {
 };
 
 /* a pool is a [growing] space for objects of the same size */
-struct _MemPool {
+
+struct _MemPool
+{
     const char *label;
     size_t obj_size;
     size_t chunk_size;
@@ -93,7 +110,8 @@ struct _MemPool {
     MemPool *next;
 };
 
-struct _MemChunk {
+struct _MemChunk
+{
     void *freeList;
     void *objCache;
     int inuse_count;
@@ -102,7 +120,8 @@ struct _MemChunk {
     time_t lastref;
 };
 
-struct _MemPoolStats {
+struct _MemPoolStats
+{
     MemPool *pool;
     const char *label;
     MemPoolMeter *meter;
@@ -122,7 +141,8 @@ struct _MemPoolStats {
     int overhead;
 };
 
-struct _MemPoolGlobalStats {
+struct _MemPoolGlobalStats
+{
     MemPoolMeter *TheMeter;
 
     int tot_pools_alloc;

diff --git a/src/HttpHeaderRange.h b/src/HttpHeaderRange.h
index db7290060459d2921101acbb7d32ad7243d148b4..ad63601cb35f50a664bbbd6908d036f371413267 100644 (file)
--- a/src/HttpHeaderRange.h
+++ b/src/HttpHeaderRange.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeaderRange.h,v 1.3 2003/03/06 11:51:55 robertc Exp $
+ * $Id: HttpHeaderRange.h,v 1.4 2003/07/14 23:53:40 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -35,6 +35,7 @@
 #define SQUID_HTTPHEADERRANGE_H
 
 #include "Range.h"
+#include "Array.h"
 
 class HttpReply;
 /* http byte-range-spec */

diff --git a/src/comm.h b/src/comm.h
index c013fe3ab338145d93a4a7069f906bdaf13fc64a..e31f0c2dcbedef6819df8ce5874b4cabc772caf4 100644 (file)
--- a/src/comm.h
+++ b/src/comm.h
@@ -2,6 +2,7 @@
 #define __COMM_H__
 
 #include "StoreIOBuffer.h"
+#include "Array.h"
 
 typedef void IOFCB(int fd, StoreIOBuffer recievedData, comm_err_t flag, int xerrno, void *data);
 typedef void IOWCB(int fd, char *buffer, size_t len, comm_err_t flag, int xerrno, void *data);