Cleanup

diff --git a/src/ClientDelayConfig.h b/src/ClientDelayConfig.h
index cec7190e7e7bd7ba5b489b804345f7df51c6aa00..30cd5abcf9a40ce36e7d431d076b671d9c6e4109 100644 (file)
--- a/src/ClientDelayConfig.h
+++ b/src/ClientDelayConfig.h
@@ -2,6 +2,7 @@
 #define SQUID_CLIENTDELAYCONFIG_H
 
 #include "acl/forward.h"
+
 #include <vector>
 
 class StoreEntry;

diff --git a/src/DelayTagged.h b/src/DelayTagged.h
index 61b6e4c620ef5993ed4ca39d1150f61dc9ec1463..f0c15d6a692a617ca6b294bec5e67315bc26017b 100644 (file)
--- a/src/DelayTagged.h
+++ b/src/DelayTagged.h
@@ -37,7 +37,6 @@
 #if USE_DELAY_POOLS
 
 #include "auth/Gadgets.h"
-#include "base/Vector.h"
 #include "CompositePoolNode.h"
 #include "DelayBucket.h"
 #include "DelayIdComposite.h"

diff --git a/src/FwdState.cc b/src/FwdState.cc
index d5482e41738c75c6fff9809eb66de13c0888397f..3a8d11e82b90dbf07404562ad9a00499ad9d8eed 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -611,7 +611,7 @@ FwdState::retryOrBail()
         if (pconnRace == raceHappened)
             debugs(17, 4, HERE << "retrying the same destination");
         else
-            serverDestinations.shift(); // last one failed. try another.
+            serverDestinations.erase(serverDestinations.begin()); // last one failed. try another.
         startConnectionOrFail();
         return;
     }

diff --git a/src/FwdState.h b/src/FwdState.h
index 5472b5164be55b238ef942e3aac34a358d34d0b0..88b577508899df9b3d1057adc719518f8a1ba0f3 100644 (file)
--- a/src/FwdState.h
+++ b/src/FwdState.h
@@ -2,7 +2,6 @@
 #define SQUID_FORWARD_H
 
 #include "base/RefCount.h"
-#include "base/Vector.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "err_type.h"

diff --git a/src/HttpHeaderRange.h b/src/HttpHeaderRange.h
index 19874eedb4800384eeefdf5d222f85a75f6183ca..41992f29a59c1ad23b3aaeecedd10184c5db04a6 100644 (file)
--- a/src/HttpHeaderRange.h
+++ b/src/HttpHeaderRange.h
@@ -32,7 +32,6 @@
 #ifndef SQUID_HTTPHEADERRANGE_H
 #define SQUID_HTTPHEADERRANGE_H
 
-#include "base/Vector.h"
 #include "MemPool.h"
 #include "Packer.h"
 #include "Range.h"

diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h
index f58885edec8a8386a89bbe9388de553e1489ca5a..3bd6bd196bd9d3ac3ed1930b8a4a70ac26576faf 100644 (file)
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@ -35,7 +35,6 @@
 
 #include "AccessLogEntry.h"
 #include "acl/Checklist.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 3e45fefed9e81f5fae35e060a0d460268dc3f6c6..a5410b3c54229fba6edc955c8eaf742103b00cc3 100644 (file)
--- a/src/StoreFileSystem.h
+++ b/src/StoreFileSystem.h
@@ -31,7 +31,7 @@
 #ifndef SQUID_STOREFILESYSTEM_H
 #define SQUID_STOREFILESYSTEM_H
 
-#include "base/Vector.h"
+#include <vector>
 
 /* ****** DOCUMENTATION ***** */
 

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

diff --git a/src/adaptation/History.h b/src/adaptation/History.h
index 52120671efcb2f942857a5c3ac1bebbf4828a664..614a875c9298767f36816a43f24962f915c8b0c9 100644 (file)
--- a/src/adaptation/History.h
+++ b/src/adaptation/History.h
@@ -3,7 +3,6 @@
 
 #include "adaptation/DynamicGroupCfg.h"
 #include "base/RefCount.h"
-#include "base/Vector.h"
 #include "HttpHeader.h"
 #include "Notes.h"
 #include "SBuf.h"

diff --git a/src/base/Vector.h b/src/base/Vector.h
index d9a0de694c636b0bd666a839a6b95f963b88edeb..05d58f128173660f7b70be7454284be261f0925b 100644 (file)
--- a/src/base/Vector.h
+++ b/src/base/Vector.h
@@ -32,7 +32,7 @@
 #define SQUID_ARRAY_H
 
 /**
- \todo CLEANUP: this file should be called Vector.h at least, and probably be replaced by STL Vector<C>
+ \todo remove this after replacing with STL
  */
 
 #include "fatal.h"

diff --git a/src/event.h b/src/event.h
index 41b7895891f94758168c35a08a476084e413e4ec..b6d61aea22b250796813e733cc597678026363d4 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -33,7 +33,6 @@
 #define SQUID_EVENT_H
 
 #include "AsyncEngine.h"
-#include "base/Vector.h"
 #include "MemPool.h"
 
 class StoreEntry;

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

diff --git a/src/ipc/Queue.h b/src/ipc/Queue.h
index eca2ca477c13901013fcd9cb9f490b36b5363949..79a7654788060329af97ef4d65ce24dde423269a 100644 (file)
--- a/src/ipc/Queue.h
+++ b/src/ipc/Queue.h
@@ -5,7 +5,6 @@
 #define SQUID_IPC_QUEUE_H
 
 #include "base/InstanceId.h"
-#include "base/Vector.h"
 #include "Debug.h"
 #include "ipc/AtomicWord.h"
 #include "ipc/mem/FlexibleArray.h"

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 22e8249883a75f8a3ba974903e8eb06f18a6c32c..3e2257e457b9d3e34da60d7ef35f8eaa28c3e2bc 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -33,7 +33,6 @@
 
 #include "squid.h"
 #include "acl/FilledChecklist.h"
-#include "base/Vector.h"
 #include "CachePeer.h"
 #include "client_side.h"
 #include "client_side_request.h"
@@ -779,7 +778,7 @@ tunnelConnectDone(const Comm::ConnectionPointer &conn, comm_err_t status, int xe
         /* At this point only the TCP handshake has failed. no data has been passed.
          * we are allowed to re-try the TCP-level connection to alternate IPs for CONNECT.
          */
-        tunnelState->serverDestinations.shift();
+        tunnelState->serverDestinations.erase(tunnelState->serverDestinations.begin());
         if (status != COMM_TIMEOUT && tunnelState->serverDestinations.size() > 0) {
             /* Try another IP of this destination host */