Merge pull request #16 from Adam-/insp20

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

diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 68c744cb9669788c1e9cd647c4e07ee6c5a61c3a..b3b00248f35f7a8a5c2bf5447d249782d38e0008 100644 (file)
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -144,7 +144,7 @@ void nspace::strlower(char *n)
 #if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
        size_t nspace::hash_compare<irc::string, std::less<irc::string> >::operator()(const irc::string &s) const
 #else
-       size_t CoreExport nspace::hash<irc::string>::operator()(const irc::string &s) const
+       size_t CoreExport irc::hash::operator()(const irc::string &s) const
 #endif
 {
        register size_t t = 0;
@@ -255,7 +255,7 @@ bool irc::tokenstream::GetToken(std::string &token)
                        /* If we find a space, or end of string, this is the end of a token.
                         */
                        last_starting_position = n+1;
-                       last_pushed = true;
+                       last_pushed = *n == ' ';
 
                        std::string strip(lsp, n+1 == tokens.end() ? n+1  : n++);
                        while ((strip.length()) && (strip.find_last_of(' ') == strip.length() - 1))