From 8a51d8969cd1b3800d15af8cf8dc6e15284da7aa Mon Sep 17 00:00:00 2001 From: pippijn Date: Thu, 12 Jun 2008 21:09:04 +0000 Subject: revert for now.. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9899 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/hashcomp.h | 8 ++++---- include/inspircd.h | 12 ------------ 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/hashcomp.h b/include/hashcomp.h index 777c4fe0e..6a6022a21 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -320,12 +320,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 */ @@ -662,7 +662,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 +680,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 diff --git a/include/inspircd.h b/include/inspircd.h index 18bb1c28f..7a06f299c 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -149,18 +149,6 @@ template inline long ConvToInt(const T &in) return atoi(tmp.str().c_str()); } -template -static inline bool operator == (std::basic_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::basic_string const &lhs, char const (&rhs)[N]) -{ - return !(lhs == rhs); -} - /** Template function to convert integer to char, storing result in *res and * also returning the pointer to res. Based on Stuart Lowe's C/C++ Pages. * @param T input value -- cgit v1.2.3