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 c0c6c00516a7e0c00481000b0bfbd404b244dd74..1825776671ed4a520d0572712ce911f18b3acc4f 100644 (file)
--- 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 9d2303c50a6d3fb887ec41e764971a1ed22d7ae3..15cf288e7dcca68d7cafb394f0f991e482068f05 100644 (file)
--- 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 2b81dcdf26973d5e8b30a89aad32448ac7e902e6..b058888c6aa375f810daf8e51c1f1460e7744af4 100644 (file)
--- 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 895a8b8c74be3ec599c650073f4b90655ac27208..459aa9e95217d81ed837f99b4ba73edde0b79537 100644 (file)
--- 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 5f72bc90954abb2493956bb0de3606ecec380e02..5cf25ab253a3f90153846f651b75c0a79c3f3086 100644 (file)
--- 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 f9ea39301a7a0f2b7c732d9fd298acf021b62aad..df9605a116d4d7de2b7685f8da5261cd7203efee 100644 (file)
--- 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 92a5fd79c4a231536e019d0d2a9444bd8416b35c..5bba166cf240122bffc666e88efc0112dabb037b 100644 (file)
--- 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 2f5e357e6b00c69c4f56649bd93e7b8383f2b9a7..05d054cf6e169479d7dc7cec86c57baebe822917 100644 (file)
--- 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 eaf249681f99a633a7b11c882521b7a89cfe24a0..5148864d55668c4095a8ba090aebaf97c1e98022 100644 (file)
--- 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 62fb7d97a2dc6e21cbe02d896b9869836ffd0770..dfb197aadce5ee6330ad8b3cdd7a75ce675aa940 100644 (file)
--- 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 abc05d95e785edf77e9ce131dbccaf3623b414fe..c296a2d2090fa48454058ef99353f9c0589cee7b 100644 (file)
--- 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 1d99e1f4effb15140b23e178678e95f2b16272e5..bb70fabfe6a9614217afbd8d56157bb7543c7358 100644 (file)
--- 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