Moved CacheDigest class to CacheDigest.h

diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index 76d91abb7a9547600e6be32a7c94d3592d0e3054..91c355c05c0d693203d6ed7f4c70aba899ad5d18 100644 (file)
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -1,3 +1,5 @@
+#ifndef SQUID_CACHEDIGEST_H_
+#define SQUID_CACHEDIGEST_H_
 /*
  * DEBUG: section 70    Cache Digest
  * AUTHOR: Alex Rousskov
@@ -30,13 +32,22 @@
  *
  */
 
-#ifndef SQUID_CACHEDIGEST_H_
-#define SQUID_CACHEDIGEST_H_
-
+/* for cache_key */
 #include "typedefs.h"
+
 class CacheDigestGuessStats;
 class StoreEntry;
-class CacheDigest;
+
+class CacheDigest {
+public:
+    /* public, read-only */
+    char *mask;         /* bit mask */
+    int mask_size;      /* mask size in bytes */
+    int capacity;       /* expected maximum for .count, not a hard limit */
+    int bits_per_entry;     /* number of bits allocated for each entry from capacity */
+    int count;          /* number of digested entries */
+    int del_count;      /* number of deletions performed so far */
+};
 
 extern CacheDigest *cacheDigestCreate(int capacity, int bpe);
 extern void cacheDigestDestroy(CacheDigest * cd);

diff --git a/src/globals.h b/src/globals.h
index f91d085a1e343125f1b0439cc547cad5d27b52d6..d6094356cc84e2a522d127bf87d10cd2fddc623e 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -41,6 +41,7 @@
 
 /* for iostats */
 #include "acl/AclDenyInfoList.h"
+#include "CacheDigest.h"
 #include "structs.h"
 
 extern char *ConfigFile;       /* NULL */

diff --git a/src/mem.cc b/src/mem.cc
index e796c0aef3016c56f9dd855d1c5a397777aa9086..58f920292401b211662dcc91fec0e5cd232b0d4c 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -33,6 +33,7 @@
 #include "squid.h"
 #include "acl/AclDenyInfoList.h"
 #include "acl/AclNameList.h"
+#include "CacheDigest.h"
 #include "ClientInfo.h"
 #include "event.h"
 #include "md5.h"

diff --git a/src/structs.h b/src/structs.h
index 49f6faf50906c0b8feba0f0f35a1c97445767f66..dc072636b8fb9a6a35f533b2fdf202885a8092b4 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -341,16 +341,6 @@ public:
     int max_stale;
 };
 
-class CacheDigest {
-public:
-    /* public, read-only */
-    char *mask;                        /* bit mask */
-    int mask_size;             /* mask size in bytes */
-    int capacity;              /* expected maximum for .count, not a hard limit */
-    int bits_per_entry;                /* number of bits allocated for each entry from capacity */
-    int count;                 /* number of digested entries */
-    int del_count;             /* number of deletions performed so far */
-};
 
 #if USE_SSL
 struct _sslproxy_cert_sign {