Fixes for building on vc12 (vs 2013), these are primarily just missing includes

This commit is contained in:
Anonymous
2014-01-23 20:19:15 -07:00
parent 65deed81ce
commit 384597f8fb
137 changed files with 979 additions and 130 deletions
+7 -4
View File
@@ -1,15 +1,18 @@
add_subdirectory(CentralServer)
add_subdirectory(ChatServer)
add_subdirectory(CommoditiesServer)
add_subdirectory(ConnectionServer)
add_subdirectory(CustomerServiceServer)
add_subdirectory(LogServer)
add_subdirectory(LoginPing)
add_subdirectory(LoginServer)
add_subdirectory(MetricsServer)
add_subdirectory(PlanetServer)
add_subdirectory(ServerConsole)
add_subdirectory(StationPlayersCollector)
add_subdirectory(TaskManager)
add_subdirectory(TransferServer)
if(NOT WIN32)
add_subdirectory(CommoditiesServer)
add_subdirectory(CustomerServiceServer)
add_subdirectory(LoginPing)
add_subdirectory(StationPlayersCollector)
endif()
@@ -19,6 +19,8 @@
#include "serverUtility/ClusterWideDataManagerList.h"
#include "sharedNetworkMessages/GameNetworkMessage.h"
#include <algorithm>
// ======================================================================
CentralServerMetricsData::CentralServerMetricsData() :
@@ -27,9 +27,7 @@
#include "sharedUtility/DataTable.h"
#include "sharedUtility/DataTableManager.h"
#ifndef max
using std::max;
#endif
#include <algorithm>
// src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp (s_maxBid)
// src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp (MAX_BID)
@@ -680,13 +678,13 @@ const AuctionBid *Auction::GetPreviousBid() const
int Auction::GetActualBid(AuctionBid *bid)
{
assert(bid != NULL);
int bidNeeded = max(m_minBid, bid->GetBid());
int bidNeeded = std::max(m_minBid, bid->GetBid());
if (m_highBid != NULL)
{
bidNeeded = m_highBid->GetBid();
if (*bid > *m_highBid)
{
bidNeeded = max(bid->GetBid(), m_highBid->GetMaxProxyBid() + 1);
bidNeeded = std::max(bid->GetBid(), m_highBid->GetMaxProxyBid() + 1);
}
else if (*bid == *m_highBid)
{
@@ -694,7 +692,7 @@ int Auction::GetActualBid(AuctionBid *bid)
}
else if (*bid < *m_highBid)
{
bidNeeded = max(m_highBid->GetBid(), bid->GetMaxProxyBid() + 1);
bidNeeded = std::max(m_highBid->GetBid(), bid->GetMaxProxyBid() + 1);
}
}
return bidNeeded;
@@ -737,7 +735,7 @@ AuctionResultCode Auction::AddBid(
)
{
AuctionResultCode success = ARC_Success;
int maxBid = max(bid, maxProxyBid);
int maxBid = std::max(bid, maxProxyBid);
if (!m_active || m_sold)
{
@@ -50,6 +50,8 @@
#include "Session/LoginAPI/Client.h"
#include "UdpLibrary.h"
#include <algorithm>
//-----------------------------------------------------------------------
namespace ClientConnectionNamespace
@@ -19,6 +19,7 @@
#include "sharedGame/PlatformFeatureBits.h"
#include "sharedLog/Log.h"
#include <algorithm>
#include <map>
#include <vector>
@@ -10,6 +10,8 @@
#include "MonAPI2/MonitorAPI.h"
#include "serverNetworkMessages/MetricsInitiationMessage.h"
#include <algorithm>
//-----------------------------------------------------------------------
std::map<std::string, int> MetricsGatheringConnection::ms_metricsSummaryTotalVal;
@@ -13,6 +13,7 @@
#include "sharedFoundation/Os.h"
#include "sharedNetworkMessages/GameNetworkMessage.h"
#include <algorithm>
//-----------------------------------------------------------------------
@@ -18,10 +18,11 @@
#include "sharedUtility/DataTable.h"
#include "sharedUtility/DataTableManager.h"
#include <cstdio>
#include <algorithm>
#include <map>
#include <set>
#include <vector>
#include <cstdio>
// ======================================================================