Removed STLport requirement

This commit is contained in:
Anonymous
2014-01-23 00:16:13 -07:00
parent a9ac73d4e5
commit fac1f2c5ae
173 changed files with 454 additions and 479 deletions
@@ -104,6 +104,5 @@ target_link_libraries(ConnectionServer
Base
CommonAPI
LoginAPI
${STLPORT_LIBRARIES}
${CMAKE_DL_LIBS}
)
@@ -395,7 +395,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg& msg)
m_suid = atoi(m_accountName.c_str());
if (m_suid == 0)
{
std::hash<std::string> h;
std::tr1::hash<std::string> h;
m_suid = h(m_accountName.c_str());
}
onValidateClient(m_suid, m_accountName, m_isSecure, NULL, ConfigConnectionServer::getDefaultGameFeatures(), ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0, ConfigConnectionServer::getFakeBuddyPoints());
@@ -6,7 +6,7 @@
//-----------------------------------------------------------------------
#include <hash_map>
#include <tr1/unordered_map>
#include <set>
#include <string>
@@ -40,9 +40,9 @@ class ConnectionServer : public MessageDispatch::Receiver
~ConnectionServer ();
typedef std::hash_map<uint32, GameConnection *> GameServerMap;
typedef std::hash_map<NetworkId, Client *,NetworkId::Hash> ClientMap;
typedef std::hash_map<uint32, ClientConnection *> SuidMap;
typedef std::tr1::unordered_map<uint32, GameConnection *> GameServerMap;
typedef std::tr1::unordered_map<NetworkId, Client *,NetworkId::Hash> ClientMap;
typedef std::tr1::unordered_map<uint32, ClientConnection *> SuidMap;
typedef std::set<uint32> FreeTrialsSet;
static void addNewClient(ClientConnection* cconn, const NetworkId &oid, GameConnection* gconn, const std::string &sceneName, bool sendToStarport );