diff options
| author | pippijn <pippijn@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-12 21:09:04 +0000 |
|---|---|---|
| committer | pippijn <pippijn@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-06-12 21:09:04 +0000 |
| commit | 8a51d8969cd1b3800d15af8cf8dc6e15284da7aa (patch) | |
| tree | 8a53afcda3873381eafc256253f46f97e75207e8 | |
| parent | 5ca2a6ffdb4dbb7f7d8f120df5f99d85d484b3ab (diff) | |
revert for now..
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9899 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | include/hashcomp.h | 8 | ||||
| -rw-r--r-- | include/inspircd.h | 12 |
2 files changed, 4 insertions, 16 deletions
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<typename T> inline long ConvToInt(const T &in) return atoi(tmp.str().c_str()); } -template<typename CharT, typename TraitsT, std::size_t N> -static inline bool operator == (std::basic_string<CharT, TraitsT> const &lhs, char const (&rhs)[N]) -{ - return lhs.length() == N - 1 && !std::memcmp(lhs.data(), rhs, N - 1); -} - -template<typename CharT, typename TraitsT, std::size_t N> -static inline bool operator != (std::basic_string<CharT, TraitsT> 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 |