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

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 0f530e97e..ec1cc5764 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -118,8 +118,8 @@ namespace irc
 	 * 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
@@ -164,10 +164,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 +177,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 +283,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 +307,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 +319,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)
 		{