From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 2 Nov 2014 05:51:22 +0000 (-0700)
Subject: SourceLayout: shuffle CbDataList to libbase
X-Git-Tag: merge-candidate-3-v1~513
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c2361bef3db8506dd8a5918c4f4061fe609630;p=thirdparty%2Fsquid.git

SourceLayout: shuffle CbDataList to libbase

Fixing a layering violation between include/ and src/cbdata.h
---

diff --git a/src/CommRead.h b/src/CommRead.h
index c0c6c00516..1825776671 100644
--- a/src/CommRead.h
+++ b/src/CommRead.h
@@ -11,7 +11,7 @@
 #ifndef COMMREAD_H
 #define COMMREAD_H
 
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "comm.h"
 #include "comm/forward.h"
 #include "CommCalls.h"
diff --git a/src/Notes.h b/src/Notes.h
index 9d2303c50a..15cf288e7d 100644
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -10,8 +10,8 @@
 #define SQUID_NOTES_H
 
 #include "acl/forward.h"
+#include "base/CbDataList.h"
 #include "base/RefCount.h"
-#include "CbDataList.h"
 #include "format/Format.h"
 #include "MemPool.h"
 #include "SquidString.h"
diff --git a/src/acl/Asn.h b/src/acl/Asn.h
index 2b81dcdf26..b058888c6a 100644
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -12,7 +12,7 @@
 #include "acl/Checklist.h"
 #include "acl/Data.h"
 #include "acl/Strategised.h"
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "ip/Address.h"
 
 int asnMatchIp(CbDataList<int> *, Ip::Address &);
diff --git a/src/acl/AtStepData.h b/src/acl/AtStepData.h
index 895a8b8c74..459aa9e952 100644
--- a/src/acl/AtStepData.h
+++ b/src/acl/AtStepData.h
@@ -13,7 +13,7 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "ssl/support.h"
 
 #include <list>
diff --git a/src/acl/HierCodeData.h b/src/acl/HierCodeData.h
index 5f72bc9095..5cf25ab253 100644
--- a/src/acl/HierCodeData.h
+++ b/src/acl/HierCodeData.h
@@ -11,7 +11,7 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "hier_code.h"
 
 /// \ingroup ACLAPI
diff --git a/src/acl/IntRange.h b/src/acl/IntRange.h
index f9ea39301a..df9605a116 100644
--- a/src/acl/IntRange.h
+++ b/src/acl/IntRange.h
@@ -10,7 +10,7 @@
 #define SQUID_ACLINTRANGE_H
 
 #include "acl/Data.h"
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "Range.h"
 
 /// \ingroup ACLAPI
diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h
index 92a5fd79c4..5bba166cf2 100644
--- a/src/acl/MethodData.h
+++ b/src/acl/MethodData.h
@@ -11,7 +11,7 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "HttpRequestMethod.h"
 
 class ACLMethodData : public ACLData<HttpRequestMethod>
diff --git a/src/acl/ProtocolData.h b/src/acl/ProtocolData.h
index 2f5e357e6b..05d054cf6e 100644
--- a/src/acl/ProtocolData.h
+++ b/src/acl/ProtocolData.h
@@ -12,7 +12,7 @@
 #include "acl/Acl.h"
 #include "acl/Data.h"
 #include "anyp/ProtocolType.h"
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 
 class ACLProtocolData : public ACLData<AnyP::ProtocolType>
 {
diff --git a/src/acl/SslErrorData.h b/src/acl/SslErrorData.h
index eaf249681f..5148864d55 100644
--- a/src/acl/SslErrorData.h
+++ b/src/acl/SslErrorData.h
@@ -11,7 +11,7 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "ssl/ErrorDetail.h"
 #include "ssl/support.h"
 #include <vector>
diff --git a/include/CbDataList.h b/src/base/CbDataList.h
similarity index 98%
rename from include/CbDataList.h
rename to src/base/CbDataList.h
index 62fb7d97a2..dfb197aadc 100644
--- a/include/CbDataList.h
+++ b/src/base/CbDataList.h
@@ -9,8 +9,7 @@
 #ifndef SQUID_CBDATALIST_H
 #define SQUID_CBDATALIST_H
 
-/* XXX: layering violation. cbdata.h is over in src/ */
-#include "../src/cbdata.h"
+#include "cbdata.h"
 
 template <class C>
 class CbDataList
diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index abc05d95e7..c296a2d209 100644
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -19,10 +19,10 @@ libbase_la_SOURCES = \
 	AsyncJobCalls.h \
 	AsyncCallQueue.cc \
 	AsyncCallQueue.h \
+	CbcPointer.h \
+	CbDataList.h \
 	CharacterSet.h \
 	CharacterSet.cc \
-	TidyPointer.h \
-	CbcPointer.h \
 	InstanceId.h \
 	Lock.h \
 	LruMap.h \
@@ -30,7 +30,8 @@ libbase_la_SOURCES = \
 	RunnersRegistry.h \
 	Subscription.h \
 	TextException.cc \
-	TextException.h
+	TextException.h \
+	TidyPointer.h
 
 EXTRA_PROGRAMS = \
 	testCharacterSet
diff --git a/src/ssl/support.h b/src/ssl/support.h
index 1d99e1f4ef..bb70fabfe6 100644
--- a/src/ssl/support.h
+++ b/src/ssl/support.h
@@ -11,7 +11,7 @@
 #ifndef SQUID_SSL_SUPPORT_H
 #define SQUID_SSL_SUPPORT_H
 
-#include "CbDataList.h"
+#include "base/CbDataList.h"
 #include "ssl/gadgets.h"
 
 #if HAVE_OPENSSL_SSL_H