From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 24 Sep 2012 09:26:42 +0000 (+0200)
Subject: Moved acl_tos and acl_nfmark to ip/qos/QosConfig.h
X-Git-Tag: SQUID_3_3_0_1~33^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0b2410838291cc2e87b9a46195505fe67b27c5e;p=thirdparty%2Fsquid.git

Moved acl_tos and acl_nfmark to ip/qos/QosConfig.h
---

diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h
index a5ff90b80b..2e277ef490 100644
--- a/src/ip/QosConfig.h
+++ b/src/ip/QosConfig.h
@@ -17,9 +17,27 @@
 #include <limits>
 #endif
 
-// Forward-declaration
+class ACLList;
 class fde;
 
+// TODO: move to new ACL framework
+// POD
+class acl_tos {
+public:
+    acl_tos *next;
+    ACLList *aclList;
+    tos_t tos;
+};
+// TODO: move to new ACL framework
+// POD
+class acl_nfmark {
+public:
+    acl_nfmark *next;
+    ACLList *aclList;
+    nfmark_t nfmark;
+};
+
+
 namespace Ip
 {
 
diff --git a/src/structs.h b/src/structs.h
index 7b3011e45a..762927367c 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -34,18 +34,6 @@
 
 class ACLList;
 
-struct acl_tos {
-    acl_tos *next;
-    ACLList *aclList;
-    tos_t tos;
-};
-
-struct acl_nfmark {
-    acl_nfmark *next;
-    ACLList *aclList;
-    nfmark_t nfmark;
-};
-
 struct acl_size_t {
     acl_size_t *next;
     ACLList *aclList;