Prep for merge from trunk: undo branch r13313, r13312, and r13311 that were

[thirdparty/squid.git] / src / acl / Acl.h

diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index 1fb45dbe7dbe325787c371eda418b59ee37df0de..cbefd6423ed2e1a14243623952dc86de47b5b8bd 100644 (file)
--- a/src/acl/Acl.h
+++ b/src/acl/Acl.h
@@ -34,7 +34,6 @@
 #define SQUID_ACL_H
 
 #include "acl/forward.h"
-#include "base/Vector.h"
 #include "cbdata.h"
 #include "defines.h"
 #include "dlink.h"
@@ -42,6 +41,7 @@
 
 #include <ostream>
 #include <string>
+#include <vector>
 
 class ConfigParser;
 
@@ -153,10 +153,10 @@ public:
         char const *typeString;
 
     private:
-        static Vector<Prototype const *> * Registry;
+        static std::vector<Prototype const *> * Registry;
         static void *Initialized;
-        typedef Vector<Prototype const*>::iterator iterator;
-        typedef Vector<Prototype const*>::const_iterator const_iterator;
+        typedef std::vector<Prototype const*>::iterator iterator;
+        typedef std::vector<Prototype const*>::const_iterator const_iterator;
         void registerMe();
     };