Store hashes of the last commit instead of the last commit

2 files changed, 15 insertions, 9 deletions

diff --git a/include/anope.h b/include/anope.h
index 1b978a8ba..6878a333c 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -308,7 +308,7 @@ namespace Anope
 	inline const string operator+(const char *_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
 	inline const string operator+(const std::string &_str, const string &str) { string tmp(_str); tmp += str; return tmp; }
 
-	struct hash
+	struct hash_ci
 	{
 		inline size_t operator()(const string &s) const
 		{
@@ -316,6 +316,14 @@ namespace Anope
 		}
 	};
 
+	struct hash_cs
+	{
+		inline size_t operator()(const string &s) const
+		{
+			return std::tr1::hash<std::string>()(s.str());
+		}
+	};
+
 	struct compare
 	{
 		inline bool operator()(const string &s1, const string &s2) const
@@ -325,7 +333,7 @@ namespace Anope
 	};
 
 	template<typename T> class map : public std::map<string, T, ci::less> { };
-	template<typename T> class hash_map : public std::tr1::unordered_map<string, T, hash, compare> { };
+	template<typename T> class hash_map : public std::tr1::unordered_map<string, T, hash_ci, compare> { };
 
 	static const char *const compiled = __TIME__ " " __DATE__;
 
diff --git a/include/serialize.h b/include/serialize.h
index f495cdd73..23c865688 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -33,8 +33,7 @@ namespace Serialize
 
 		virtual std::iostream& operator[](const Anope::string &key) = 0;
 		virtual std::set<Anope::string> KeySet() const { throw CoreException("Not supported"); }
-
-		virtual bool IsEqual(Data *other) { throw CoreException("Not supported"); }
+		virtual size_t Hash() const { throw CoreException("Not supported"); }
 
 		virtual void SetType(const Anope::string &key, Type t) { }
 		virtual Type GetType(const Anope::string &key) const { return DT_TEXT; }
@@ -65,12 +64,11 @@ class CoreExport Serializable : public virtual Base
  private:
  	/* Iterator into serializable_items */
 	std::list<Serializable *>::iterator s_iter;
-	/* The last serialized form of this object commited to the database */
-	Serialize::Data *last_commit;
+	/* The hash of the last serialized form of this object commited to the database */
+	size_t last_commit;
 	/* The last time this object was commited to the database */
 	time_t last_commit_time;
 
-	Serializable();
  protected:
  	Serializable(const Anope::string &serialize_type);
 	Serializable(const Serializable &);
@@ -87,8 +85,8 @@ class CoreExport Serializable : public virtual Base
 	 */
 	void QueueUpdate();
 
-	bool IsCached(Serialize::Data *);
-	void UpdateCache(Serialize::Data *);
+	bool IsCached(Serialize::Data &);
+	void UpdateCache(Serialize::Data &);
 
 	bool IsTSCached();
 	void UpdateTS();