Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index f322b69da98bf5f879812f8f63f9387d5b3f7586..d107df3093efd5cbe51a236eab2a3ac6b64f46c4 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -69,9 +69,9 @@ using namespace std;
 
 size_t nspace::hash<in_addr>::operator()(const struct in_addr &a) const
 {
-        size_t q;
-        memcpy(&q,&a,sizeof(size_t));
-        return q;
+       size_t q;
+       memcpy(&q,&a,sizeof(size_t));
+       return q;
 }
 
 size_t nspace::hash<string>::operator()(const string &s) const
@@ -95,7 +95,7 @@ bool irc::StrHashComp::operator()(const std::string& s1, const std::string& s2)
 
 bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) const
 {
-        return (s1.s_addr == s1.s_addr);
+       return (s1.s_addr == s1.s_addr);
 }
 
 /******************************************************
@@ -113,31 +113,31 @@ bool irc::InAddr_HashComp::operator()(const in_addr &s1, const in_addr &s2) cons
 
 bool irc::irc_char_traits::eq(char c1st, char c2nd)
 {
-       return lowermap[(unsigned)c1st] == lowermap[(unsigned)c2nd];
+       return lowermap[(unsigned char)c1st] == lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::ne(char c1st, char c2nd)
 {
-       return lowermap[(unsigned)c1st] != lowermap[(unsigned)c2nd];
+       return lowermap[(unsigned char)c1st] != lowermap[(unsigned char)c2nd];
 }
 
 bool irc::irc_char_traits::lt(char c1st, char c2nd)
 {
-       return lowermap[(unsigned)c1st] < lowermap[(unsigned)c2nd];
+       return lowermap[(unsigned char)c1st] < lowermap[(unsigned char)c2nd];
 }
 
 int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
 {
        for(unsigned int i = 0; i < n; i++)
        {
-               if(lowermap[(unsigned)*str1] > lowermap[(unsigned)*str2])
-                               return 1;
+               if(lowermap[(unsigned char)*str1] > lowermap[(unsigned char)*str2])
+                               return 1;
 
-               if(lowermap[(unsigned)*str1] < lowermap[(unsigned)*str2])
-                       return -1;
+               if(lowermap[(unsigned char)*str1] < lowermap[(unsigned char)*str2])
+                       return -1;
 
-               if(*str1 == 0 || *str2 == 0)
-                       return 0;
+               if(*str1 == 0 || *str2 == 0)
+                       return 0;
 
                str1++;
                str2++;
@@ -167,7 +167,7 @@ bool operator== (irc::string& leftval, std::string& rightval)
 
 const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
 {
-       while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
+       while(n-- > 0 && lowermap[(unsigned char)*s1] != lowermap[(unsigned char)c])
                s1++;
        return s1;
 }