Merge pull request #961 from SaberUK/insp20+fix-snotice

[user/henk/code/inspircd.git] / src / hashcomp.cpp

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 2275a100619a87e747efab28bf05e035744f4647..3fb7f84fbf0fde09d799a6091faeca177b4e39f9 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -127,15 +127,12 @@ void nspace::strlower(char *n)
        }
 }
 
-#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
-       size_t nspace::hash_compare<std::string, std::less<std::string> >::operator()(const std::string &s) const
+#ifdef HASHMAP_DEPRECATED
+       size_t CoreExport nspace::insensitive::operator()(const std::string &s) const
 #else
-       #ifdef HASHMAP_DEPRECATED
-               size_t CoreExport nspace::insensitive::operator()(const std::string &s) const
-       #else
-               size_t nspace::hash<std::string>::operator()(const std::string &s) const
-       #endif
+       size_t nspace::hash<std::string>::operator()(const std::string &s) const
 #endif
+
 {
        /* XXX: NO DATA COPIES! :)
         * The hash function here is practically
@@ -150,11 +147,7 @@ void nspace::strlower(char *n)
 }
 
 
-#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
-       size_t nspace::hash_compare<irc::string, std::less<irc::string> >::operator()(const irc::string &s) const
-#else
-       size_t CoreExport irc::hash::operator()(const irc::string &s) const
-#endif
+size_t CoreExport irc::hash::operator()(const irc::string &s) const
 {
        register size_t t = 0;
        for (irc::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */
@@ -333,7 +326,7 @@ bool irc::sepstream::GetToken(std::string &token)
                n++;
        }
 
-       token = "";
+       token.clear();
        return false;
 }
 
@@ -490,7 +483,7 @@ irc::portparser::portparser(const std::string &source, bool allow_overlapped)
 
 bool irc::portparser::Overlaps(long val)
 {
-       if (!overlapped)
+       if (overlapped)
                return false;
 
        return (!overlap_set.insert(val).second);