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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index eafc74abf..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"
@@ -129,10 +130,10 @@ namespace irc
 	/** irc::stringjoiner joins string lists into a string, using
 	 * the given seperator string.
 	 * This class can join a vector of std::string, a deque of
-	 * std::string, or a const char** array, using overloaded
+	 * std::string, or a const char* const* array, using overloaded
 	 * constructors.
 	 */
-	class CoreExport stringjoiner
+	class CoreExport stringjoiner : public classbase
 	{
 	 private:
 		/** Output string
@@ -159,7 +160,7 @@ namespace irc
 		 * @param begin The starting element in the sequence to be joined
 		 * @param end The ending element in the sequence to be joined
 		 */
-		stringjoiner(const std::string &seperator, const char** sequence, int begin, int end);
+		stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end);
 
 		/** Get the joined sequence
 		 * @return A reference to the joined string
@@ -171,9 +172,10 @@ namespace irc
 	 * It can then reproduce this list, clamped to a maximum of MAXMODES
 	 * values per line.
 	 */
-	class CoreExport modestacker
+	class CoreExport modestacker : public classbase
 	{
 	 private:
+		InspIRCd* ServerInstance;
 		/** The mode sequence and its parameters
 		 */
 		std::deque<std::string> sequence;
@@ -187,7 +189,7 @@ namespace irc
 		 * @param add True if the stack is adding modes,
 		 * false if it is removing them
 		 */
-		modestacker(bool add);
+		modestacker(InspIRCd* Instance, bool add);
 		/** Push a modeletter and its parameter onto the stack.
 		 * No checking is performed as to if this mode actually
 		 * requires a parameter. If you stack invalid mode
@@ -242,7 +244,7 @@ namespace irc
 	 * list will be ":item". This is to allow for parsing 'source' fields
 	 * from data.
 	 */
-	class CoreExport tokenstream
+	class CoreExport tokenstream : public classbase
 	{
 	 private:
 		/** Original string
@@ -319,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
 		 */
@@ -619,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(); }
@@ -644,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
@@ -661,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;
@@ -679,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
@@ -687,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
@@ -696,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