Modifications for bounded

git-svn-id: file:///dev/shm/somefilter.svn@610 e102df66-1e2e-11dd-9b44-c24451a4db5e

util/scoped.hh

@@ -5,6 +5,7 @@
 
 #include <cstddef>
 #include <cstdio>
+#include <stdlib.h>
 
 namespace util {
 
@@ -34,6 +35,34 @@ template <class T, class R, R (*Free)(T*)> class scoped_thing {
     scoped_thing &operator=(const scoped_thing &);
 };
 
+template <class T> class scoped_malloc {
+  public:
+    scoped_malloc() : p_(NULL) {}
+
+    scoped_malloc(T *p) : p_(p) {}
+
+    ~scoped_malloc() { free(p_); }
+
+    void reset(T *p) {
+      scoped_malloc other(p_);
+      p_ = p;
+    }
+
+    T &operator*() { return *p_; }
+    const T &operator*() const { return *p_; }
+    T &operator->() { return *p_; }
+    const T&operator->() const { return *p_; }
+
+    T *get() { return p_; }
+    const T *get() const { return p_; }
+
+  private:
+    T *p_;
+
+    scoped_malloc(const scoped_malloc &);
+    scoped_malloc &operator=(const scoped_malloc &);
+};
+
 class scoped_fd {
   public:
     scoped_fd() : fd_(-1) {}

util/sized_iterator.hh

@@ -6,6 +6,9 @@
 #include <functional>
 #include <string>
 
+#include <inttypes.h>
+#include <string.h>
+
 namespace util {
 
 class SizedInnerIterator {
@@ -74,6 +77,8 @@ class SizedProxy {
 
 typedef ProxyIterator<SizedProxy> SizedIterator;
 
+SizedIterator SizedIt(void *ptr, std::size_t size) { return SizedIterator(SizedProxy(ptr, size)); }
+
 // Useful wrapper for a comparison function i.e. sort.  
 template <class Delegate, class Proxy = SizedProxy> class SizedCompare : public std::binary_function<const Proxy &, const Proxy &, bool> {
   public:
@@ -91,6 +96,8 @@ template <class Delegate, class Proxy = SizedProxy> class SizedCompare : public
     bool operator()(const std::string &first, const std::string &second) const {
       return delegate_(first.data(), second.data());
     }
+
+    const Delegate &GetDelegate() const { return delegate_; }
 
   private:
     const Delegate delegate_;