SourceLayout: rename Array.h to base/Vector.h

Also moves the unit-test for Vector<> to src/tests.

diff --git a/include/Stack.h b/include/Stack.h
index b15c02d599c93e05b4a0c73c1d710bca4ccf5ed1..fe39f6680fd4f283dfec70a5b49712ee74d1c3d0 100644 (file)
--- a/include/Stack.h
+++ b/include/Stack.h
@@ -32,7 +32,7 @@
 #ifndef SQUID_STACK_H
 #define SQUID_STACK_H
 
-#include "Array.h"
+#include "base/Vector.h"
 
 /* RBC: 20030714 Composition might be better long-term, but for now,
  * there's no reason to do so.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 05d363e8c8ce0cb828a18cad78a1706de4b81044..5b7d72cc70cbc8fa13af5001ef1833099d1880d9 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -78,8 +78,6 @@ TESTS += tests/testAll
 check_PROGRAMS += tests/testAll
 
 tests_testAll_SOURCES= \
-       tests/testArray.h \
-       tests/testArray.cc \
        tests/testRFC1035.h \
        tests/testRFC1035.cc \
        tests/testRFC1738.h \

diff --git a/lib/tests/testArray.cc b/lib/tests/testArray.cc
deleted file mode 100644 (file)
index ffbfebb..0000000
--- a/lib/tests/testArray.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-#define SQUID_UNIT_TEST 1
-#include "squid.h"
-
-#if HAVE_ASSERT_H
-#include <assert.h>
-#endif
-
-#include "testArray.h"
-#include "Array.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION( testArray );
-
-void testArray::all()
-{
-    CPPUNIT_ASSERT( 1 == 1 );
-    Vector<int> aArray;
-    CPPUNIT_ASSERT (aArray.size() == 0);
-    aArray.push_back(2);
-    CPPUNIT_ASSERT (aArray.size() == 1);
-    CPPUNIT_ASSERT (aArray.back() == 2);
-    CPPUNIT_ASSERT (aArray.size() == 1);
-}

diff --git a/src/ClientDelayConfig.h b/src/ClientDelayConfig.h
index d48f93d60093c8eba6b35d57c6725c124f9a45c6..9acfc140cf666deeb65632f695d1e34c4de68856 100644 (file)
--- a/src/ClientDelayConfig.h
+++ b/src/ClientDelayConfig.h
@@ -1,7 +1,8 @@
 #ifndef SQUID_CLIENTDELAYCONFIG_H
 #define SQUID_CLIENTDELAYCONFIG_H
 
-#include "Array.h"
+#include "base/Vector.h"
+
 class StoreEntry;
 class acl_access;
 class ConfigParser;

diff --git a/src/ConfigOption.h b/src/ConfigOption.h
index f881ce00ef26243b47d855c11610fcfd80aafa5e..2016eb6b7f2a023e9c79f87447b8272ac9a0c261 100644 (file)
--- a/src/ConfigOption.h
+++ b/src/ConfigOption.h
@@ -30,8 +30,7 @@
 #ifndef SQUID_CONFIGOPTION_H
 #define SQUID_CONFIGOPTION_H
 
-/* for Vector<> */
-#include "Array.h"
+#include "base/Vector.h"
 
 class StoreEntry;
 

diff --git a/src/CpuAffinityMap.h b/src/CpuAffinityMap.h
index 4fc062468c07e5f5080f5919c916f8d6467e5313..d322573f3d60b04bf17893222f202f0b5c3246df 100644 (file)
--- a/src/CpuAffinityMap.h
+++ b/src/CpuAffinityMap.h
@@ -4,7 +4,7 @@
 #ifndef SQUID_CPU_AFFINITY_MAP_H
 #define SQUID_CPU_AFFINITY_MAP_H
 
-#include "Array.h"
+#include "base/Vector.h"
 
 class CpuAffinitySet;
 

diff --git a/src/DelayPools.h b/src/DelayPools.h
index 534e561ed1ed2ea3d9851c54a01f16416b20d16b..f7748e262a3ceea40dd8a768496c009f661d7e9a 100644 (file)
--- a/src/DelayPools.h
+++ b/src/DelayPools.h
@@ -32,6 +32,12 @@
 #ifndef SQUID_DELAYPOOLS_H
 #define SQUID_DELAYPOOLS_H
 
+#include "base/Vector.h"
+
+class DelayPool;
+class Updateable;
+class StoreEntry;
+
 /**
  \defgroup DelayPoolsAPI Delay Pools API
  \ingroup Components
@@ -47,14 +53,6 @@ public:
     virtual void update(int) = 0;
 };
 
-/* forward decls */
-class DelayPool;
-class Updateable;
-class StoreEntry;
-
-/* for Vector<> */
-#include "Array.h"
-
 /// \ingroup DelayPoolsAPI
 class DelayPools
 {

diff --git a/src/DelayTagged.h b/src/DelayTagged.h
index e0a9772bee2098b22a54a25fcf1fa301be9368d8..342506c28953cdbe1fe58c01833c41e4c7695313 100644 (file)
--- a/src/DelayTagged.h
+++ b/src/DelayTagged.h
@@ -41,7 +41,7 @@
 #include "DelayIdComposite.h"
 #include "DelayBucket.h"
 #include "DelaySpec.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "splay.h"
 
 /// \ingroup DelayPoolsAPI

diff --git a/src/DelayUser.h b/src/DelayUser.h
index 205fb40948e0c8269903441ad3b1753cdff9794b..885cbbd1981e98470e8b2ef50f9fe74fab030767 100644 (file)
--- a/src/DelayUser.h
+++ b/src/DelayUser.h
@@ -42,7 +42,7 @@
 #include "DelayIdComposite.h"
 #include "DelayBucket.h"
 #include "DelaySpec.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "splay.h"
 
 /// \ingroup DelayPoolsAPI

diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h
index ca301e331c57a98f508a1fc08199037facd30324..b8d18a0970778302a10ac375ef93607d6afb4552 100644 (file)
--- a/src/DiskIO/DiskIOModule.h
+++ b/src/DiskIO/DiskIOModule.h
@@ -32,7 +32,7 @@
 #ifndef SQUID_DISKIOMODULE_H
 #define SQUID_DISKIOMODULE_H
 
-#include "Array.h"
+#include "base/Vector.h"
 
 /* forward decls */
 

diff --git a/src/EventLoop.h b/src/EventLoop.h
index 63736ddd9476145c71c9cf50a6e6039ff35cd778..fe267760652b52ee47e8d4e15414f0c2b305656b 100644 (file)
--- a/src/EventLoop.h
+++ b/src/EventLoop.h
@@ -31,7 +31,7 @@
 #ifndef SQUID_EVENTLOOP_H
 #define SQUID_EVENTLOOP_H
 
-#include "Array.h"
+#include "base/Vector.h"
 
 #define EVENT_LOOP_TIMEOUT     1000 /* 1s timeout */
 

diff --git a/src/FadingCounter.h b/src/FadingCounter.h
index 99f9492d081b1a8c86470034dd7d69cebd6ffa3b..9430ef14f68ce0d5aa7d5e371051be4c8f8aa8d1 100644 (file)
--- a/src/FadingCounter.h
+++ b/src/FadingCounter.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_FADING_COUNTER_H
 #define SQUID_FADING_COUNTER_H
 
-#include "Array.h"
+#include "base/Vector.h"
 
 /// Counts events, forgetting old ones. Usefull for "3 errors/minute" limits.
 class FadingCounter

diff --git a/src/HttpHeaderRange.h b/src/HttpHeaderRange.h
index d1dec803bf4bfeb0a865ae70d70025f85c41145d..0a66b83d06328cbf9ede264efb3ef28ab864003a 100644 (file)
--- a/src/HttpHeaderRange.h
+++ b/src/HttpHeaderRange.h
@@ -32,7 +32,7 @@
 #ifndef SQUID_HTTPHEADERRANGE_H
 #define SQUID_HTTPHEADERRANGE_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "MemPool.h"
 #include "Packer.h"
 #include "Range.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index d8c141ca7bd2a444f32b240d7b960234e23da46b..17742fbf491c1356cdabf203af6bde442a91103a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1090,6 +1090,7 @@ check_PROGRAMS+=\
        tests/testURL \
        tests/testConfigParser \
        tests/testStatHist \
+       tests/testVector \
        $(STORE_TESTS)
 
 ## NP: required to run the above list. check_PROGRAMS only builds the binaries...
@@ -3868,6 +3869,21 @@ tests_testStatHist_LDADD = \
        $(COMPAT_LIB)
 tests_testStatHist_DEPENDENCIES = $(SQUID_CPPUNIT_LA)
 
+tests_testVector_SOURCES = \
+       tests/testVector.cc \
+       tests/testMain.cc \
+       tests/testVector.h \
+       time.cc
+nodist_tests_testVector_SOURCES = \
+       $(TESTSOURCES)
+tests_testVector_LDADD= \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+tests_testVector_LDFLAGS = $(LIBADD_DL)
+tests_testVector_DEPENDENCIES = \
+       $(SQUID_CPPUNIT_LA)
+
 
 TESTS += testHeaders
 

diff --git a/src/Notes.h b/src/Notes.h
index 860eaaaa591773c3fd290bd0b858c7631d9abdf1..daa576864b45482e1dd166c184082eb6cee1b9fb 100644 (file)
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_NOTES_H
 #define SQUID_NOTES_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "base/RefCount.h"
 #include "CbDataList.h"
 #include "MemPool.h"

diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h
index 1e694c8e28073f440dbda80d9b73142f4086b347..1ad666d4bdc071e4b7408eaee2c616de70301bed 100644 (file)
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@ -34,7 +34,7 @@
 #define   SQUID_PEERSELECTSTATE_H
 
 #include "acl/Checklist.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "cbdata.h"
 #include "comm/forward.h"
 #include "hier_code.h"

diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h
index 18b683b7592eac293d1eb4b72d4aaddf643e3e87..a83b848415fb60df6e2701a1a2bec9afd0c6cef1 100644 (file)
--- a/src/StoreFileSystem.h
+++ b/src/StoreFileSystem.h
@@ -31,7 +31,7 @@
 #ifndef SQUID_STOREFILESYSTEM_H
 #define SQUID_STOREFILESYSTEM_H
 
-#include "Array.h"
+#include "base/Vector.h"
 
 /* ****** DOCUMENTATION ***** */
 

diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index e7ae5af6f372641b0b49db1a4cc92e40bc205aa0..4c8613fbf861c873393a493bad17e89657767a33 100644 (file)
--- a/src/acl/Acl.h
+++ b/src/acl/Acl.h
@@ -33,7 +33,7 @@
 #ifndef SQUID_ACL_H
 #define SQUID_ACL_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "cbdata.h"
 #include "defines.h"
 #include "dlink.h"

diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc
index a5edde2decd22b28a143cdf995a4511ff67d1df3..2908a4101b2bbe973496d0676df297edc03e76ed 100644 (file)
--- a/src/adaptation/Config.cc
+++ b/src/adaptation/Config.cc
@@ -36,7 +36,7 @@
 #include "adaptation/History.h"
 #include "adaptation/Service.h"
 #include "adaptation/ServiceGroups.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "ConfigParser.h"
 #include "globals.h"
 #include "HttpReply.h"

diff --git a/src/adaptation/DynamicGroupCfg.h b/src/adaptation/DynamicGroupCfg.h
index a2ec4b61d45a1bbda2bc28d57c8e94dc8ddfa191..8f70ee4bf4eedaf9100abe608f02e5e67f9fcee7 100644 (file)
--- a/src/adaptation/DynamicGroupCfg.h
+++ b/src/adaptation/DynamicGroupCfg.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_ADAPTATION__DYNAMIC_GROUP_CFG_H
 #define SQUID_ADAPTATION__DYNAMIC_GROUP_CFG_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "SquidString.h"
 
 namespace Adaptation

diff --git a/src/adaptation/History.h b/src/adaptation/History.h
index c2fe8f1434a71e2835f5d94f21a4d4a777626ab6..07b3cf312fb9e86cf49bb26c869b91ae2c1b3ea9 100644 (file)
--- a/src/adaptation/History.h
+++ b/src/adaptation/History.h
@@ -2,7 +2,7 @@
 #define SQUID_ADAPT_HISTORY_H
 
 #include "adaptation/DynamicGroupCfg.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "base/RefCount.h"
 #include "HttpHeader.h"
 #include "Notes.h"

diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h
index 043bb74e6997f0582157e89be38333b3f46d59cc..0fdaf803418d5b3d98c22f74f0badfc17f8921f4 100644 (file)
--- a/src/adaptation/ServiceGroups.h
+++ b/src/adaptation/ServiceGroups.h
@@ -2,7 +2,7 @@
 #define SQUID_ADAPTATION__SERVICE_GROUPS_H
 
 #include "SquidString.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "adaptation/Elements.h"
 #include "adaptation/forward.h"
 #include "base/RefCount.h"

diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc
index b7879fbff2a8b0342ba529f969d79e6278029b74..3e2288e0c799f8377e121364b246cd2ab80219c1 100644 (file)
--- a/src/adaptation/icap/Config.cc
+++ b/src/adaptation/icap/Config.cc
@@ -33,7 +33,7 @@
 #include "squid.h"
 #include "ConfigParser.h"
 #include "Store.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "adaptation/icap/Config.h"
 #include "adaptation/icap/ServiceRep.h"
 #include "HttpRequest.h"

diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h
index 8a677eb5b94db453c8acfd00dc3d8bc7f65891fb..1f2ed38aba100242b958a3980d462ff9f2da074c 100644 (file)
--- a/src/auth/Scheme.h
+++ b/src/auth/Scheme.h
@@ -33,7 +33,7 @@
 
 #if USE_AUTH
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "base/RefCount.h"
 
 /**

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index 23ca7e0e2cfa472774a1e323e44705888b0fe3aa..fa87fc16fb59b09e9a5ed6aad833c2dcf0438fdc 100644 (file)
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -22,4 +22,6 @@ libbase_la_SOURCES = \
        Subscription.h \
        TextException.cc \
        TextException.h \
-       StringArea.h
+       StringArea.h \
+       Vector.cc \
+       Vector.h

diff --git a/lib/Array.cc b/src/base/Vector.cc
similarity index 98%
rename from lib/Array.cc
rename to src/base/Vector.cc
index 967864a9a4964957392863333ccf24b0a68bc5d9..afc420aec942cb70bdba53b2bb9bcbd59f207f6b 100644 (file)
--- a/lib/Array.cc
+++ b/src/base/Vector.cc
@@ -38,7 +38,7 @@
  */
 
 #include "squid.h"
-#include "Array.h"
+#include "base/Vector.h"
 
 #if HAVE_ASSERT_H
 #include <assert.h>

diff --git a/include/Array.h b/src/base/Vector.h
similarity index 100%
rename from include/Array.h
rename to src/base/Vector.h

diff --git a/src/comm/AcceptLimiter.h b/src/comm/AcceptLimiter.h
index a31d96af252332de210187885d9d90cd9ab88418..50689efaed27d57f44a15901986bf4ac6496c96e 100644 (file)
--- a/src/comm/AcceptLimiter.h
+++ b/src/comm/AcceptLimiter.h
@@ -1,7 +1,7 @@
 #ifndef _SQUID_SRC_COMM_ACCEPT_LIMITER_H
 #define _SQUID_SRC_COMM_ACCEPT_LIMITER_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "comm/TcpAcceptor.h"
 
 namespace Comm

diff --git a/src/comm/forward.h b/src/comm/forward.h
index 2d5a5031f0a3452a804ba6f9ea12eaf04a1bee5b..104d7a7820d69aaac5670ed558b61789741ad2f5 100644 (file)
--- a/src/comm/forward.h
+++ b/src/comm/forward.h
@@ -1,7 +1,7 @@
 #ifndef _SQUID_COMM_FORWARD_H
 #define _SQUID_COMM_FORWARD_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "base/RefCount.h"
 
 namespace Comm

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index a979d94e35200709e99d7e57be1f4aa7d95e7943..a5fd963ebc332c0598217537735c497b4e5ffdca 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -42,7 +42,7 @@
 #include "squid.h"
 
 #if USE_DELAY_POOLS
-#include "Array.h"
+#include "base/Vector.h"
 #include "client_side_request.h"
 #include "comm/Connection.h"
 #include "CommonPool.h"

diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
index 4f1c0835f53f183eba242d7e60d719ac2c60954e..4f1cc56fee016a4823995a051f64148181a5064b 100644 (file)
--- a/src/esi/CustomParser.cc
+++ b/src/esi/CustomParser.cc
@@ -32,7 +32,7 @@
  */
 
 #include "squid.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "esi/CustomParser.h"
 #include "Debug.h"
 #include "Trie.h"

diff --git a/src/esi/VarState.h b/src/esi/VarState.h
index 4101d3d08e555fb42281a177782c5d70c090f059..5c632bcdced0334ac441e3753da6e7a4f5220361 100644 (file)
--- a/src/esi/VarState.h
+++ b/src/esi/VarState.h
@@ -34,7 +34,7 @@
 
 #include "esi/Segment.h"
 #include "Trie.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "HttpHeader.h"
 
 class HttpReply;

diff --git a/src/event.h b/src/event.h
index aa269292a26b21612b004852d4cb80594f397e40..e35460d4489163bfe3059fdb90b5852867f566a4 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -32,7 +32,7 @@
 #ifndef SQUID_EVENT_H
 #define SQUID_EVENT_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "AsyncEngine.h"
 #include "MemPool.h"
 

diff --git a/src/forward.h b/src/forward.h
index dd59ac577dbfbe063bc71ef3e96661f7d8fca65c..22eadbfb76b424a470850a5fe0b0290eb32a7c2b 100644 (file)
--- a/src/forward.h
+++ b/src/forward.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_FORWARD_H
 #define SQUID_FORWARD_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "base/RefCount.h"
 #include "comm.h"
 #include "comm/Connection.h"

diff --git a/src/ipc/Coordinator.h b/src/ipc/Coordinator.h
index 91a45372d5a1ad5deb6af878a646ee66301dd2e4..69631380a66724bcc165dfcf708ef4596f70084f 100644 (file)
--- a/src/ipc/Coordinator.h
+++ b/src/ipc/Coordinator.h
@@ -6,7 +6,7 @@
 #ifndef SQUID_IPC_COORDINATOR_H
 #define SQUID_IPC_COORDINATOR_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "ipc/Messages.h"
 #include "ipc/Port.h"
 #include "ipc/SharedListen.h"

diff --git a/src/ipc/Kids.h b/src/ipc/Kids.h
index a0519a78846aa7e5a5c09d8fcbdeb928049b43b7..2263189b6018ee7cb01499c46ad9754d1e364d00 100644 (file)
--- a/src/ipc/Kids.h
+++ b/src/ipc/Kids.h
@@ -4,7 +4,7 @@
 #ifndef SQUID_IPC_KIDS_H
 #define SQUID_IPC_KIDS_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "ipc/Kid.h"
 
 /// a collection of kids

diff --git a/src/ipc/Queue.h b/src/ipc/Queue.h
index 8311a13a3550598fe6195e8cc93d2986de5fcf17..6c2fecd8b7f8e7134a21b60873f68d837bf9ddca 100644 (file)
--- a/src/ipc/Queue.h
+++ b/src/ipc/Queue.h
@@ -4,7 +4,7 @@
 #ifndef SQUID_IPC_QUEUE_H
 #define SQUID_IPC_QUEUE_H
 
-#include "Array.h"
+#include "base/Vector.h"
 #include "Debug.h"
 #include "base/InstanceId.h"
 #include "ipc/AtomicWord.h"

diff --git a/src/tests/testVector.cc b/src/tests/testVector.cc
new file mode 100644 (file)
index 0000000..430f041
--- /dev/null
+++ b/src/tests/testVector.cc
@@ -0,0 +1,19 @@
+#define SQUID_UNIT_TEST 1
+#include "squid.h"
+#include "base/Vector.h"
+#include "tests/testVector.h"
+
+#include <cppunit/TestAssert.h>
+
+CPPUNIT_TEST_SUITE_REGISTRATION( testVector );
+
+void testVector::all()
+{
+    CPPUNIT_ASSERT( 1 == 1 );
+    Vector<int> aArray;
+    CPPUNIT_ASSERT(aArray.size() == 0);
+    aArray.push_back(2);
+    CPPUNIT_ASSERT(aArray.size() == 1);
+    CPPUNIT_ASSERT(aArray.back() == 2);
+    CPPUNIT_ASSERT(aArray.size() == 1);
+}

diff --git a/lib/tests/testArray.h b/src/tests/testVector.h
similarity index 59%
rename from lib/tests/testArray.h
rename to src/tests/testVector.h
index 4b0ddbdb2795a9c00eccbf707732f86fbf02ec5e..f1606db217375f0a1b94385a43d1b3e9bfe23cee 100644 (file)
--- a/lib/tests/testArray.h
+++ b/src/tests/testVector.h
@@ -1,6 +1,5 @@
-
-#ifndef SQUID_LIB_TEST_ARRAY_H
-#define SQUID_LIB_TEST_ARRAY_H
+#ifndef SQUID_SRC_TESTS_TESTVECTOR_H
+#define SQUID_SRC_TESTS_TESTVECTOR_H
 
 #include <cppunit/extensions/HelperMacros.h>
 
@@ -10,9 +9,9 @@
  *
  */
 
-class testArray : public CPPUNIT_NS::TestFixture
+class testVector : public CPPUNIT_NS::TestFixture
 {
-    CPPUNIT_TEST_SUITE( testArray );
+    CPPUNIT_TEST_SUITE( testVector );
     CPPUNIT_TEST( all );
     CPPUNIT_TEST_SUITE_END();
 
@@ -23,4 +22,3 @@ protected:
 };
 
 #endif
-

diff --git a/src/tunnel.cc b/src/tunnel.cc
index ed75442cf71d76990a6fcf70a0d98611a2ec45ad..af4711824c227525f9e47c3d9d4cd222ba577c1f 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -33,7 +33,7 @@
 
 #include "squid.h"
 #include "acl/FilledChecklist.h"
-#include "Array.h"
+#include "base/Vector.h"
 #include "CachePeer.h"
 #include "client_side_request.h"
 #include "client_side.h"