X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=de556f39316cf93216577eed69109bf50a3a9f92;hb=11916574f67962dce1d7a2fdf7ef6a3d2d1fa49f;hp=0f530e97e30709334109c69d7cadba2af470698d;hpb=01ac5148e948de53cd708bb28d0fd237263a0fbf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 0f530e97e..de556f393 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -114,12 +114,17 @@ namespace irc
 		size_t CoreExport operator()(const std::string &s) const;
 	};
 
+	struct insensitive_swo
+	{
+		bool CoreExport operator()(const std::string& a, const std::string& b) const;
+	};
+
 	/** The irc_char_traits class is used for RFC-style comparison of strings.
 	 * This class is used to implement irc::string, a case-insensitive, RFC-
 	 * comparing string class.
 	 */
-	struct irc_char_traits : std::char_traits<char> {
-
+	struct CoreExport irc_char_traits : public std::char_traits<char>
+	{
 		/** Check if two chars match.
 		 * @param c1st First character
 		 * @param c2nd Second character
@@ -148,7 +153,7 @@ namespace irc
 		 * @return similar to strcmp, zero for equal, less than zero for str1
 		 * being less and greater than zero for str1 being greater than str2.
 		 */
-		static CoreExport int compare(const char* str1, const char* str2, size_t n);
+		static int compare(const char* str1, const char* str2, size_t n);
 
 		/** Find a char within a string up to position n.
 		 * @param s1 String to find in
@@ -156,7 +161,7 @@ namespace irc
 		 * @param c Character to search for
 		 * @return Pointer to the first occurance of c in s1
 		 */
-		static CoreExport const char* find(const char* s1, int  n, char c);
+		static const char* find(const char* s1, int  n, char c);
 	};
 
 	/** This typedef declares irc::string based upon irc_char_traits.
@@ -164,10 +169,8 @@ namespace irc
 	typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
 
 	/** 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* const* array, using overloaded
-	 * constructors.
+	 * space as the separator.
+	 * This class can join a vector of std::string.
 	 */
 	class CoreExport stringjoiner
 	{
@@ -179,13 +182,11 @@ namespace irc
 
 	 public:
 
-		/** Join elements of a vector, between (and including) begin and end
-		 * @param seperator The string to seperate values with
-		 * @param sequence One or more items to seperate
-		 * @param begin The starting element in the sequence to be joined
-		 * @param end The ending element in the sequence to be joined
+		/** Join all elements of a vector, in the resulting string
+		 * each element will be seperated by a single space character.
+		 * @param sequence Zero or more items to seperate
 		 */
-		stringjoiner(const std::string& seperator, const std::vector<std::string>& sequence, unsigned int begin, unsigned int end);
+		stringjoiner(const std::vector<std::string>& sequence);
 
 		/** Get the joined sequence
 		 * @return A constant reference to the joined string
@@ -287,7 +288,7 @@ namespace irc
 	 public:
 		/** Create a sepstream and fill it with the provided data
 		 */
-		sepstream(const std::string &source, char seperator, bool allowempty = false);
+		sepstream(const std::string &source, char separator, bool allowempty = false);
 
 		/** Fetch the next token from the stream
 		 * @param token The next token from the stream is placed here
@@ -311,7 +312,7 @@ namespace irc
 	class CoreExport commasepstream : public sepstream
 	{
 	 public:
-		/** Initialize with comma seperator
+		/** Initialize with comma separator
 		 */
 		commasepstream(const std::string &source, bool allowempty = false) : sepstream(source, ',', allowempty)
 		{
@@ -323,7 +324,7 @@ namespace irc
 	class CoreExport spacesepstream : public sepstream
 	{
 	 public:
-		/** Initialize with space seperator
+		/** Initialize with space separator
 		 */
 		spacesepstream(const std::string &source, bool allowempty = false) : sepstream(source, ' ', allowempty)
 		{