X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=9499c00e49c17a1579351db8dc08fc33ba05b200;hb=8f0b1082d8eb9927ab2fdb8e00328df69d198c9a;hp=928abe809c8b8018433f001ca8d2665608fdb248;hpb=7d7250484c352c13830e63ae41ee8faae40a9bd5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 928abe809..9499c00e4 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -14,6 +14,7 @@
 #ifndef _HASHCOMP_H_
 #define _HASHCOMP_H_
 
+#include <cstring>
 //#include "inspircd_config.h"
 //#include "socket.h"
 #include "hash_map.h"
@@ -320,12 +321,12 @@ namespace irc
 		 * @return True if tokens still remain, false if there are none left
 		 */
 		virtual bool GetToken(std::string &token);
-		
+
 		/** Fetch the entire remaining stream, without tokenizing
 		 * @return The remaining part of the stream
 		 */
 		virtual const std::string GetRemaining();
-		
+
 		/** Returns true if the end of the stream has been reached
 		 * @return True if the end of the stream has been reached, otherwise false
 		 */
@@ -620,6 +621,21 @@ inline bool operator!= (const std::string& leftval, const irc::string& rightval)
 	return !(leftval.c_str() == rightval);
 }
 
+// FIXME MAXBUF messes up these
+#if 0
+template<std::size_t N>
+static inline bool operator == (std::string const &lhs, char const (&rhs)[N])
+{
+	return lhs.length() == N - 1 && !std::memcmp(lhs.data(), rhs, N - 1);
+}
+
+template<std::size_t N>
+static inline bool operator != (std::string const &lhs, char const (&rhs)[N])
+{
+	return !(lhs == rhs);
+}
+#endif
+
 /** Assign an irc::string to a std::string.
  */
 inline std::string assign(const irc::string &other) { return other.c_str(); }
@@ -645,8 +661,8 @@ inline std::string& trim(std::string &str)
 /** Hashing stuff is totally different on vc++'s hash_map implementation, so to save a buttload of
  * #ifdefs we'll just do it all at once
  */
-namespace nspace
-{
+BEGIN_HASHMAP_NAMESPACE
+
 	/** Hashing function to hash irc::string
 	 */
 #ifdef WINDOWS
@@ -662,7 +678,7 @@ namespace nspace
 			if(s1.length() != s2.length()) return true;
 			return (irc::irc_char_traits::compare(s1.c_str(), s2.c_str(), s1.length()) < 0);
 		}
-		
+
 		/** Hash an irc::string value for hash_map
 		 */
 		size_t operator()(const irc::string & s) const;
@@ -680,7 +696,7 @@ namespace nspace
 			if(s1.length() != s2.length()) return true;
 			return (irc::irc_char_traits::compare(s1.c_str(), s2.c_str(), s1.length()) < 0);
 		}
-		
+
 		/** Hash a std::string using RFC1459 case sensitivity rules
 		* @param s A string to hash
 		* @return The hash value
@@ -688,6 +704,7 @@ namespace nspace
 		size_t operator()(const std::string & s) const;
 	};
 #else
+
 	template<> struct hash<irc::string>
 	{
 		/** Hash an irc::string using RFC1459 case sensitivity rules
@@ -697,21 +714,25 @@ namespace nspace
 		size_t operator()(const irc::string &s) const;
 	};
 
+	/* XXX FIXME: Implement a hash function overriding std::string's that works with TR1! */
+
+#ifdef HASHMAP_DEPRECATED
+	struct insensitive
+#else
 	template<> struct hash<std::string>
+#endif
 	{
-		/** Hash a std::string using RFC1459 case sensitivity rules
-		* @param s A string to hash
-		* @return The hash value
-		*/
 		size_t operator()(const std::string &s) const;
 	};
+
 #endif
 
 	/** Convert a string to lower case respecting RFC1459
 	* @param n A string to lowercase
 	*/
 	void strlower(char *n);
-}
+
+END_HASHMAP_NAMESPACE
 
 #endif