Squid3-maverick-patch

squid3.maverick.patch

diff --git a/compat/unsafe.h b/compat/unsafe.h
index d58f546..6c9f7ab 100644
--- a/compat/unsafe.h
+++ b/compat/unsafe.h
@@ -5,7 +5,7 @@
  * Trap unintentional use of functions unsafe for use within squid.
  */
 
-#if !SQUID_NO_STRING_BUFFER_PROTECT
+#if !SQUID_NO_STRING_BUFFER_PROTECT && 0
 #ifndef sprintf
 #define sprintf ERROR_sprintf_UNSAFE_IN_SQUID
 #endif
diff --git a/include/Array.h b/include/Array.h
index 8cee5fa..8f43522 100644
--- a/include/Array.h
+++ b/include/Array.h
@@ -35,6 +35,7 @@
  \todo CLEANUP: this file should be called Vector.h at least, and probably be replaced by STL Vector<C>
  */
 
+#include <iterator>
 #include "fatal.h"
 #include "util.h"
 
@@ -44,7 +45,7 @@
 /* iterator support */
 
 template <class C>
-class VectorIteratorBase
+class VectorIteratorBase : public std::iterator <std::forward_iterator_tag, typename C::value_type>
 {
 
 public: