Merge insp20

[user/henk/code/inspircd.git] / include / hashcomp.h

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 0f530e97e30709334109c69d7cadba2af470698d..6cd3fc3c0fd06f6d7cb67c39ca0011433dbd1a60 100644 (file)
--- 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,42 +161,18 @@ 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.
         */
        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.
+       /** Joins the contents of a vector to a string.
+        * @param sequence Zero or more items to join.
+        * @separator The character to place between the items.
         */
-       class CoreExport stringjoiner
-       {
-        private:
-
-               /** Output string
-                */
-               std::string joined;
-
-        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
-                */
-               stringjoiner(const std::string& seperator, const std::vector<std::string>& sequence, unsigned int begin, unsigned int end);
-
-               /** Get the joined sequence
-                * @return A constant reference to the joined string
-                */
-               const std::string& GetJoined() const { return joined; }
-       };
+       std::string CoreExport stringjoiner(const std::vector<std::string>& sequence, char separator = ' ');
 
        /** irc::modestacker stacks mode sequences into a list.
         * It can then reproduce this list, clamped to a maximum of MAXMODES
@@ -287,7 +268,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 +292,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 +304,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)
                {