Added + and == operators between std::string and irc::string.

Its too late at night to wrestle with the = operator, this can wait for another time.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3260 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/hashcomp.h b/include/hashcomp.h
index 3aa838da2f93c52e0233c970c801344098b93143..0d6bc7e6ff64807567ecdff32a6b350e4d3f8d5e 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -136,4 +136,13 @@ namespace irc
 std::ostream& operator<<(std::ostream &os, const irc::string &str);
 std::istream& operator>>(std::istream &is, irc::string &str);
 
+/* Define operators for + and == with irc::string to std::string for easy assignment
+ * and comparison - Brain
+ */
+
+std::string& operator+ (std::string& leftval, irc::string& rightval);
+irc::string& operator+ (irc::string& leftval, std::string& rightval);
+std::string& operator== (std::string& leftval, irc::string& rightval);
+irc::string& operator== (irc::string& leftval, std::string& rightval);
+
 #endif

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 652618a796f4d390790519f07d0ce23c3f8ea30d..c5725a0bde6dd77916b0eee6d90bf82bcb13c458 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -142,6 +142,26 @@ 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());
+}
+
+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 (rightval == irc::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])