X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=3fb7f84fbf0fde09d799a6091faeca177b4e39f9;hb=383a68a38ab34fa8cc0884c854e8e255d927f399;hp=2275a100619a87e747efab28bf05e035744f4647;hpb=a8d911c021c92d424882003cf22cf4e154ec5ea2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 2275a1006..3fb7f84fb 100644
--- 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);