Refactor all users of Vector to std::vector except for Stack

diff --git a/src/FwdState.cc b/src/FwdState.cc
index 881cb94dad15ab2e855c3cd1a5d39530ee53c830..d5482e41738c75c6fff9809eb66de13c0888397f 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -472,7 +472,7 @@ FwdState::complete()
         entry->reset();
 
         // drop the last path off the selection list. try the next one.
-        serverDestinations.shift();
+        serverDestinations.erase(serverDestinations.begin());
         startConnectionOrFail();
 
     } else {

diff --git a/src/auth/Config.h b/src/auth/Config.h
index aa731adfa3e5d5eea410632312de8b59ac09ba2e..ad4da18ab9b527751a0bf0fbe3ff36f9c97a480c 100644 (file)
--- a/src/auth/Config.h
+++ b/src/auth/Config.h
@@ -150,7 +150,7 @@ public:
     Format::Format *keyExtras; ///< The compiled request format
 };
 
-typedef Vector<Config *> ConfigVector;
+typedef std::vector<Config *> ConfigVector;
 
 extern ConfigVector TheConfig;
 

diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc
index bce72370c424505ddd90bf83f4bfc2220bd57920..996f1908d16505d6dfb6eb8280a83ca75e7a311d 100644 (file)
--- a/src/auth/Scheme.cc
+++ b/src/auth/Scheme.cc
@@ -37,7 +37,7 @@
 #include "auth/Scheme.h"
 #include "globals.h"
 
-Vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;
+std::vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;
 
 void
 Auth::Scheme::AddScheme(Auth::Scheme::Pointer instance)
@@ -63,11 +63,11 @@ Auth::Scheme::Find(const char *typestr)
     return Auth::Scheme::Pointer(NULL);
 }
 
-Vector<Auth::Scheme::Pointer> &
+std::vector<Auth::Scheme::Pointer> &
 Auth::Scheme::GetSchemes()
 {
     if (!_Schemes)
-        _Schemes = new Vector<Auth::Scheme::Pointer>;
+        _Schemes = new std::vector<Auth::Scheme::Pointer>;
 
     return *_Schemes;
 }

diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h
index f5d22fa01f87c81a61e7b35f24c19be39d5382cf..19d592a3751bebb62b365ce6fe65fa7010f528c3 100644 (file)
--- a/src/auth/Scheme.h
+++ b/src/auth/Scheme.h
@@ -34,7 +34,8 @@
 #if USE_AUTH
 
 #include "base/RefCount.h"
-#include "base/Vector.h"
+
+#include <vector>
 
 /**
  \defgroup AuthSchemeAPI       Authentication Scheme API
@@ -60,8 +61,8 @@ class Scheme : public RefCountable
 {
 public:
     typedef RefCount<Scheme> Pointer;
-    typedef Vector<Scheme::Pointer>::iterator iterator;
-    typedef Vector<Scheme::Pointer>::const_iterator const_iterator;
+    typedef std::vector<Scheme::Pointer>::iterator iterator;
+    typedef std::vector<Scheme::Pointer>::const_iterator const_iterator;
 
 public:
     Scheme() : initialised (false) {};
@@ -93,13 +94,13 @@ public:
     Scheme(Scheme const &);
     Scheme &operator=(Scheme const&);
 
-    static Vector<Scheme::Pointer> &GetSchemes();
+    static std::vector<Scheme::Pointer> &GetSchemes();
 
 protected:
     bool initialised;
 
 private:
-    static Vector<Scheme::Pointer> *_Schemes;
+    static std::vector<Scheme::Pointer> *_Schemes;
 };
 
 } // namespace Auth

diff --git a/src/comm/AcceptLimiter.cc b/src/comm/AcceptLimiter.cc
index 7af4beaaf82eb058757adf917fbea30184ded9c5..6e144f9308f8284f8246cd03cbfcfaead345af89 100644 (file)
--- a/src/comm/AcceptLimiter.cc
+++ b/src/comm/AcceptLimiter.cc
@@ -47,7 +47,8 @@ Comm::AcceptLimiter::kick()
     debugs(5, 5, "size=" << deferred_.size());
     while (deferred_.size() > 0 && fdNFree() >= RESERVED_FD) {
         /* NP: shift() is equivalent to pop_front(). Giving us a FIFO queue. */
-        TcpAcceptor::Pointer temp = deferred_.shift();
+        TcpAcceptor::Pointer temp = deferred_.front();
+        deferred_.erase(deferred_.begin());
         if (temp.valid()) {
             debugs(5, 5, "doing one.");
             -- temp->isLimited;

diff --git a/src/comm/AcceptLimiter.h b/src/comm/AcceptLimiter.h
index 50689efaed27d57f44a15901986bf4ac6496c96e..d6c28f3cb6398c06fb3a408d37495ecc86fa23b1 100644 (file)
--- a/src/comm/AcceptLimiter.h
+++ b/src/comm/AcceptLimiter.h
@@ -1,9 +1,10 @@
 #ifndef _SQUID_SRC_COMM_ACCEPT_LIMITER_H
 #define _SQUID_SRC_COMM_ACCEPT_LIMITER_H
 
-#include "base/Vector.h"
 #include "comm/TcpAcceptor.h"
 
+#include <vector>
+
 namespace Comm
 {
 
@@ -24,7 +25,7 @@ namespace Comm
  * or to NULL an entry while scanning the list for empty spaces.
  * Side effect: TcpAcceptor->kick() becomes allowed to pull off multiple accept()'s in bunches
  *
- * 2) re-implement as a list instead of vector?
+ * 2) re-implement as a std::queue instead of std::vector
  * storing head/tail pointers for fast push/pop and avoiding the whole shift() overhead
  */
 class AcceptLimiter
@@ -47,7 +48,7 @@ private:
     static AcceptLimiter Instance_;
 
     /** FIFO queue */
-    Vector<TcpAcceptor::Pointer> deferred_;
+    std::vector<TcpAcceptor::Pointer> deferred_;
 };
 
 }; // namepace Comm

diff --git a/src/comm/forward.h b/src/comm/forward.h
index 711c546814edeedb0b378b3fcc5f2a8d120bde9e..caa4e2c6b8ed1a096cd303a4f311de71d4dc5a57 100644 (file)
--- a/src/comm/forward.h
+++ b/src/comm/forward.h
@@ -2,7 +2,8 @@
 #define _SQUID_COMM_FORWARD_H
 
 #include "base/RefCount.h"
-#include "base/Vector.h"
+
+#include <vector>
 
 namespace Comm
 {
@@ -11,7 +12,7 @@ class Connection;
 
 typedef RefCount<Comm::Connection> ConnectionPointer;
 
-typedef Vector<Comm::ConnectionPointer> ConnectionList;
+typedef std::vector<Comm::ConnectionPointer> ConnectionList;
 
 bool IsConnOpen(const Comm::ConnectionPointer &conn);
 

diff --git a/src/esi/VarState.h b/src/esi/VarState.h
index 7a00daf244df63c69eb4b2452c205d95219af371..87b4b53ef60adf9735a87aa81a94b435cc7618ff 100644 (file)
--- a/src/esi/VarState.h
+++ b/src/esi/VarState.h
@@ -32,11 +32,12 @@
 #ifndef SQUID_ESIVARSTATE_H
 #define SQUID_ESIVARSTATE_H
 
-#include "base/Vector.h"
 #include "esi/Segment.h"
 #include "HttpHeader.h"
 #include "libTrie/Trie.h"
 
+#include <vector>
+
 class HttpReply;
 
 /* esi variable replacement logic */
@@ -117,7 +118,7 @@ private:
     void doIt ();
     void setupUserAgent();
     Trie variables;
-    Vector<Variable*> variablesForCleanup;
+    std::vector<Variable*> variablesForCleanup;
     Variable *defaultVariable;
 };
 

diff --git a/src/tests/stub_DiskIOModule.cc b/src/tests/stub_DiskIOModule.cc
index 457726bc7bba69ea428ed222c96cb95870d34ae2..c3136e0bab94b51bc9c1cd90d0eae3453d7693a6 100644 (file)
--- a/src/tests/stub_DiskIOModule.cc
+++ b/src/tests/stub_DiskIOModule.cc
@@ -4,10 +4,13 @@
 #include "tests/STUB.h"
 
 #include "DiskIO/DiskIOModule.h"
+
+#include <vector>
+
 void DiskIOModule::SetupAllModules() STUB
 void DiskIOModule::ModuleAdd(DiskIOModule &) STUB
 void DiskIOModule::FreeAllModules() STUB
 void DiskIOModule::PokeAllModules() STUB
 DiskIOModule *DiskIOModule::Find(char const *) STUB_RETVAL(NULL)
 DiskIOModule *DiskIOModule::FindDefault() STUB_RETVAL(NULL)
-Vector<DiskIOModule*> const &DiskIOModule::Modules() STUB_RETSTATREF(Vector<DiskIOModule*>)
+std::vector<DiskIOModule*> const &DiskIOModule::Modules() STUB_RETSTATREF(std::vector<DiskIOModule*>)

diff --git a/src/tests/stub_libauth.cc b/src/tests/stub_libauth.cc
index a14c3151b79c73b7502cd7409315fdd43c664834..accf8e90dc3e4053fd394ccb9546e53ce256f30a 100644 (file)
--- a/src/tests/stub_libauth.cc
+++ b/src/tests/stub_libauth.cc
@@ -21,10 +21,11 @@ AuthUserHashPointer::AuthUserHashPointer(Auth::User::Pointer anAuth_user) STUB
 Auth::User::Pointer AuthUserHashPointer::user() const STUB_RETVAL(NULL)
 
 #include "auth/Scheme.h"
-Vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;
+#include <vector>
+std::vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;
 void Auth::Scheme::AddScheme(Auth::Scheme::Pointer) STUB
 Auth::Scheme::Pointer Auth::Scheme::Find(const char *) STUB_RETVAL(NULL)
-Vector<Auth::Scheme::Pointer> & Auth::Scheme::GetSchemes() STUB_RETVAL(*_Schemes);
+std::vector<Auth::Scheme::Pointer> & Auth::Scheme::GetSchemes() STUB_RETVAL(*_Schemes);
 void Auth::Scheme::FreeAll() STUB
 
 #include "auth/User.h"