X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhashcomp.h;h=9499c00e49c17a1579351db8dc08fc33ba05b200;hb=8f0b1082d8eb9927ab2fdb8e00328df69d198c9a;hp=777c4fe0e00becd960f76e6847b248b3841fc83a;hpb=b3e3b1f14e12b4b0a395ef8e2a4848f132e2c22b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/hashcomp.h b/include/hashcomp.h index 777c4fe0e..9499c00e4 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -14,6 +14,7 @@ #ifndef _HASHCOMP_H_ #define _HASHCOMP_H_ +#include //#include "inspircd_config.h" //#include "socket.h" #include "hash_map.h" @@ -320,12 +321,12 @@ namespace irc * @return True if tokens still remain, false if there are none left */ virtual bool GetToken(std::string &token); - + /** Fetch the entire remaining stream, without tokenizing * @return The remaining part of the stream */ virtual const std::string GetRemaining(); - + /** Returns true if the end of the stream has been reached * @return True if the end of the stream has been reached, otherwise false */ @@ -620,6 +621,21 @@ inline bool operator!= (const std::string& leftval, const irc::string& rightval) return !(leftval.c_str() == rightval); } +// FIXME MAXBUF messes up these +#if 0 +template +static inline bool operator == (std::string const &lhs, char const (&rhs)[N]) +{ + return lhs.length() == N - 1 && !std::memcmp(lhs.data(), rhs, N - 1); +} + +template +static inline bool operator != (std::string const &lhs, char const (&rhs)[N]) +{ + return !(lhs == rhs); +} +#endif + /** Assign an irc::string to a std::string. */ inline std::string assign(const irc::string &other) { return other.c_str(); } @@ -662,7 +678,7 @@ BEGIN_HASHMAP_NAMESPACE if(s1.length() != s2.length()) return true; return (irc::irc_char_traits::compare(s1.c_str(), s2.c_str(), s1.length()) < 0); } - + /** Hash an irc::string value for hash_map */ size_t operator()(const irc::string & s) const; @@ -680,7 +696,7 @@ BEGIN_HASHMAP_NAMESPACE if(s1.length() != s2.length()) return true; return (irc::irc_char_traits::compare(s1.c_str(), s2.c_str(), s1.length()) < 0); } - + /** Hash a std::string using RFC1459 case sensitivity rules * @param s A string to hash * @return The hash value