X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhashcomp.cpp;h=2c7dca5b128e1bd9f15adc0b5eaa8c54c0c8e7fb;hb=754f0130893bacb2b69a32c3de9ed1b3da9659cd;hp=42e25f8f6a6248bfb0efc19294857cd409d34e19;hpb=47dda4f61512f6047f2b1dcccd1943aab74726e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 42e25f8f6..2c7dca5b1 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -151,15 +151,7 @@ unsigned const char rfc_case_sensitive_map[256] = {
 	250, 251, 252, 253, 254, 255,                     // 250-255
 };
 
-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 */
-		t = 5 * t + national_case_insensitive_map[(unsigned char)*x];
-	return t;
-}
-
-bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2) const
+bool irc::equals(const std::string& s1, const std::string& s2)
 {
 	const unsigned char* n1 = (const unsigned char*)s1.c_str();
 	const unsigned char* n2 = (const unsigned char*)s2.c_str();
@@ -196,7 +188,7 @@ size_t irc::insensitive::operator()(const std::string &s) const
 	 * only with *x replaced with national_case_insensitive_map[*x].
 	 * This avoids a copy to use hash<const char*>
 	 */
-	register size_t t = 0;
+	size_t t = 0;
 	for (std::string::const_iterator x = s.begin(); x != s.end(); ++x) /* ++x not x++, as its faster */
 		t = 5 * t + national_case_insensitive_map[(unsigned char)*x];
 	return t;
@@ -280,14 +272,6 @@ bool irc::tokenstream::GetToken(std::string &token)
 	return true;
 }
 
-bool irc::tokenstream::GetToken(irc::string &token)
-{
-	std::string stdstring;
-	bool returnval = GetToken(stdstring);
-	token = assign(stdstring);
-	return returnval;
-}
-
 bool irc::tokenstream::GetToken(int &token)
 {
 	std::string tok;