resource loading bugs and new sound class

[chaz/yoink] / src / moof / hash.hh

diff --git a/src/moof/hash.hh b/src/moof/hash.hh
index 27cc650147ab98c81a90b4a6ff57d08dab4cab66..ea63db152ad53f05bc7b3643b45437a5b13a2efc 100644 (file)
--- a/src/moof/hash.hh
+++ b/src/moof/hash.hh
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include <moof/stlplus/hash.hpp>
+#include <stlplus/containers/hash.hpp>
 
 
 namespace moof {
@@ -39,9 +39,10 @@ struct hash_function
                return (*this)(val.data(), val.length());
        }
 
-       unsigned operator () (int val) const
+       template <class T>
+       unsigned operator () (T val) const
        {
-               return val;
+               return static_cast<unsigned>(val);
        }
 };