From 169a73ceb38e941eefa195dcb66e45cea24ba041 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 20 Dec 2014 12:15:55 +1300
Subject: [PATCH] SourceLayout: shuffle mem_type enum to libmem

---
 src/enums.h       | 33 ---------------------------------
 src/mem/forward.h | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/enums.h b/src/enums.h
index bf8a14607e..a5a3d88c35 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -143,39 +143,6 @@ enum {
 };
 #endif /* SQUID_SNMP */
 
-typedef enum {
-    MEM_NONE,
-    MEM_2K_BUF,
-    MEM_4K_BUF,
-    MEM_8K_BUF,
-    MEM_16K_BUF,
-    MEM_32K_BUF,
-    MEM_64K_BUF,
-    MEM_ACL_DENY_INFO_LIST,
-    MEM_ACL_NAME_LIST,
-#if USE_CACHE_DIGESTS
-    MEM_CACHE_DIGEST,
-#endif
-    MEM_CLIENT_INFO,
-    MEM_LINK_LIST,
-    MEM_DLINK_NODE,
-    MEM_DREAD_CTRL,
-    MEM_DWRITE_Q,
-    MEM_HTTP_HDR_CONTENT_RANGE,
-    MEM_MD5_DIGEST,
-    MEM_NETDBENTRY,
-    MEM_NET_DB_NAME,
-    MEM_RELIST,
-    // IMPORTANT: leave this here. pools above are initialized early with memInit()
-    MEM_DONTFREE,
-    // following pools are initialized late by their component if needed (or never)
-    MEM_FQDNCACHE_ENTRY,
-    MEM_FWD_SERVER,
-    MEM_IDNS_QUERY,
-    MEM_IPCACHE_ENTRY,
-    MEM_MAX
-} mem_type;
-
 enum {
     STORE_LOG_CREATE,
     STORE_LOG_SWAPIN,
diff --git a/src/mem/forward.h b/src/mem/forward.h
index 65d95e6bd5..cd18c364ad 100644
--- a/src/mem/forward.h
+++ b/src/mem/forward.h
@@ -11,8 +11,6 @@
 #ifndef _SQUID_SRC_MEM_FORWARD_H
 #define _SQUID_SRC_MEM_FORWARD_H
 
-/* for mem_type */
-#include "enums.h"
 #include "mem/AllocatorProxy.h"
 /* for FREE */
 #include "typedefs.h"
@@ -35,6 +33,40 @@ namespace Mem
 
 extern const size_t squidSystemPageSize;
 
+/// Types of memory pool which do not yet use MEMPROXY_CLASS() API
+typedef enum {
+    MEM_NONE,
+    MEM_2K_BUF,
+    MEM_4K_BUF,
+    MEM_8K_BUF,
+    MEM_16K_BUF,
+    MEM_32K_BUF,
+    MEM_64K_BUF,
+    MEM_ACL_DENY_INFO_LIST,
+    MEM_ACL_NAME_LIST,
+#if USE_CACHE_DIGESTS
+    MEM_CACHE_DIGEST,
+#endif
+    MEM_CLIENT_INFO,
+    MEM_LINK_LIST,
+    MEM_DLINK_NODE,
+    MEM_DREAD_CTRL,
+    MEM_DWRITE_Q,
+    MEM_HTTP_HDR_CONTENT_RANGE,
+    MEM_MD5_DIGEST,
+    MEM_NETDBENTRY,
+    MEM_NET_DB_NAME,
+    MEM_RELIST,
+    // IMPORTANT: leave this here. pools above are initialized early with memInit()
+    MEM_DONTFREE,
+    // following pools are initialized late by their component if needed (or never)
+    MEM_FQDNCACHE_ENTRY,
+    MEM_FWD_SERVER,
+    MEM_IDNS_QUERY,
+    MEM_IPCACHE_ENTRY,
+    MEM_MAX
+} mem_type;
+
 void memClean(void);
 void memInitModule(void);
 void memCleanModule(void);
-- 
2.47.2