From a3a7a7879e0716eebfbfd4418c05245c0e203e6d Mon Sep 17 00:00:00 2001 From: lotodore Date: Tue, 7 Apr 2009 22:23:29 +0000 Subject: [PATCH] Fixing branch problem. --- src/net/common/serverlobbythread.cpp | 4 ++-- src/net/serverlobbythread.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index ab9bc6c2..67175d46 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -1382,8 +1382,8 @@ ServerLobbyThread::IsPlayerBanned(const std::string &name) const { bool retVal = false; boost::mutex::scoped_lock lock(m_banPlayerNameListMutex); - RegExList::const_iterator i = m_banPlayerNameList.begin(); - RegExList::const_iterator end = m_banPlayerNameList.end(); + RegexList::const_iterator i = m_banPlayerNameList.begin(); + RegexList::const_iterator end = m_banPlayerNameList.end(); while (i != end) { if (regex_match(name, *i)) diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h index 8ac52e35..1194bc04 100644 --- a/src/net/serverlobbythread.h +++ b/src/net/serverlobbythread.h @@ -102,6 +102,7 @@ protected: typedef std::map > GameMap; typedef std::map TimerClientAddressMap; typedef std::list RemoveGameList; + typedef std::list RegexList; // Main function of the thread. virtual void Main(); @@ -191,7 +192,7 @@ private: SessionIdList m_resubscribeList; mutable boost::mutex m_resubscribeListMutex; - RegExList m_banPlayerNameList; + RegexList m_banPlayerNameList; mutable boost::mutex m_banPlayerNameListMutex; GameMap m_gameMap;