swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-30 15:13:12 -04:00
Code Issues Projects Releases Wiki Activity

Removed references to tr1 now that c++11 works

Browse Source
This commit is contained in:
Anonymous
2014-01-23 09:28:13 -07:00
parent e6431a9fd4
commit 210bdb91d8
56 changed files with 198 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp
+4 -4
View File
@@ -590,8 +590,8 @@ static time_t s_timeMarketConnectionCre
static std::map<int, std::pair<CachedNetworkId, int> > s_queries;
static std::map<NetworkId, QueuedQuery *> s_queryTime;
static int s_nextRequestId;
static std::tr1::unordered_map<NetworkId, ItemLoadPair, NetworkId::Hash> s_pendingLoads;
static std::tr1::unordered_map<int, int> s_pendingAdds; //sequence to cost map
static std::unordered_map<NetworkId, ItemLoadPair, NetworkId::Hash> s_pendingLoads;
static std::unordered_map<int, int> s_pendingAdds; //sequence to cost map
// all money transactions transfer money out of or to the bank of the player and never to or from the vendor/bazaar location except bazaar sale fees
static const std::string COMMODITIES_NAMED_ACCOUNT("commodities_named_escrow_account");
@@ -1321,7 +1321,7 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId
}
}
}
std::tr1::unordered_map<int, int>::iterator f = s_pendingAdds.find(sequence);
std::unordered_map<int, int>::iterator f = s_pendingAdds.find(sequence);
int auctionFee = 0;
if (f != s_pendingAdds.end())
{
@@ -2488,7 +2488,7 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId)
if (!ConfigServerGame::getCommoditiesMarketEnabled())
return;
LOG("AuctionRetrieval", ("CommoditiesMarket::response from DB for loading object %s for retrieval", itemId.getValueString().c_str()));
std::tr1::unordered_map<NetworkId, ItemLoadPair, NetworkId::Hash>::iterator f = s_pendingLoads.find(itemId);
std::unordered_map<NetworkId, ItemLoadPair, NetworkId::Hash>::iterator f = s_pendingLoads.find(itemId);
if (f != s_pendingLoads.end())
{
CreatureObject *player = dynamic_cast<CreatureObject *>(NetworkIdManager::getObjectById((*f).second.ownerId));