Decide that it wasn't quite appropriate :(

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 91a75d5e3c35539143823e11c4a53ccfb2229659..e948134205827e3f2380189273ca311d2576a464 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -92,13 +92,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
 {
-        size_t q;
-        size_t p;
-
-        memcpy(&q,&s1,sizeof(size_t));
-        memcpy(&p,&s2,sizeof(size_t));
-
-        return (q == p);
+        return (s1.s_addr == s1.s_addr);
 }
 
 /******************************************************
@@ -148,9 +142,43 @@ int irc::irc_char_traits::compare(const char* str1, const char* str2, size_t n)
        return 0;
 }
 
+std::string operator+ (std::string& leftval, irc::string& rightval)
+{
+       return leftval + std::string(rightval.c_str());
+}
+
+irc::string operator+ (irc::string& leftval, std::string& rightval)
+{
+       return leftval + irc::string(rightval.c_str());
+}
+
+bool operator== (std::string& leftval, irc::string& rightval)
+{
+       return (leftval == std::string(rightval.c_str()));
+}
+
+bool operator== (irc::string& leftval, std::string& rightval)
+{
+       return (rightval == std::string(leftval.c_str()));
+}
+
 const char* irc::irc_char_traits::find(const char* s1, int  n, char c)
 {
        while(n-- > 0 && lowermap[(unsigned)*s1] != lowermap[(unsigned)c])
                s1++;
        return s1;
 }
+
+/* See hashcomp.h if you care about these... */
+std::ostream& operator<<(std::ostream &os, const irc::string &str)
+{
+       return os << str.c_str();
+}
+
+std::istream& operator>>(std::istream &is, irc::string &str)
+{
+       std::string tmp;
+       is >> tmp;
+       str = tmp.c_str();
+       return is;
+}