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

engine/server/application/CMakeLists.txt

@@ -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()

engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp

@@ -19,6 +19,8 @@
 #include "serverUtility/ClusterWideDataManagerList.h"
 #include "sharedNetworkMessages/GameNetworkMessage.h"
 
+#include <algorithm>
+
 // ======================================================================
 
 CentralServerMetricsData::CentralServerMetricsData() :

engine/server/application/CommoditiesServer/src/shared/Auction.cpp

@@ -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)
 	{

engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp

@@ -50,6 +50,8 @@
 #include "Session/LoginAPI/Client.h"
 #include "UdpLibrary.h"
 
+#include <algorithm>
+
 //-----------------------------------------------------------------------
 
 namespace ClientConnectionNamespace

engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp

@@ -19,6 +19,7 @@
 #include "sharedGame/PlatformFeatureBits.h"
 #include "sharedLog/Log.h"
 
+#include <algorithm>
 #include <map>
 #include <vector>
 

engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp

@@ -10,6 +10,8 @@
 #include "MonAPI2/MonitorAPI.h"
 #include "serverNetworkMessages/MetricsInitiationMessage.h"
 
+#include <algorithm>
+
 //-----------------------------------------------------------------------
 
 std::map<std::string, int> MetricsGatheringConnection::ms_metricsSummaryTotalVal;

engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp

@@ -13,6 +13,7 @@
 #include "sharedFoundation/Os.h"
 #include "sharedNetworkMessages/GameNetworkMessage.h"
 
+#include <algorithm>
 
 //-----------------------------------------------------------------------
 

engine/server/application/PlanetServer/src/shared/PreloadManager.cpp

@@ -18,10 +18,11 @@
 #include "sharedUtility/DataTable.h"
 #include "sharedUtility/DataTableManager.h"
 
-#include <cstdio>
+#include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
+#include <cstdio>
 
 // ======================================================================
 

engine/server/library/serverBase/src/shared/core/ServerBase.cpp

@@ -35,7 +35,9 @@ void ServerBase::install (ServerBaseImpl* implementation)
 	SetupSharedNetwork::SetupData  networkSetupData;
 	SetupSharedNetwork::getDefaultServerSetupData(networkSetupData);
 	SetupSharedNetwork::install(networkSetupData);
+#ifndef WIN32
 	Os::setProgramName(ConfigServerBase::getServerName());
+#endif
 	NetworkHandler::install();
 	char tmp[128] = {"\0"};
 	IGNORE_RETURN(snprintf(tmp, sizeof(tmp), "%s:%d", ConfigServerBase::getServerName() ,Os::getProcessId()));

engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp

@@ -9,6 +9,7 @@
 #include "serverDatabase/AbstractTableBuffer.h"
 
 #include <algorithm>
+#include <iterator>
 #include <set>
 #include <vector>
 

engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp

@@ -18,6 +18,8 @@
 #include "sharedDatabaseInterface/DbTaskQueue.h"
 #include "Snapshot.h"
 
+#include <algorithm>
+
 //-----------------------------------------------------------------------
 
 DatabaseMetricsData::DatabaseMetricsData() :

engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp

@@ -15,6 +15,7 @@
 #include "sharedRandom/Random.h"
 #include "sharedFoundation/Misc.h"
 
+#include <algorithm>
 #include <deque>
 
 // ======================================================================

engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp

@@ -11,6 +11,8 @@
 #include "sharedFoundation/NetworkId.h"
 #include "sharedMath/Vector.h"
 
+#include <algorithm>
+
 //-------------------------------------------------------------------
 
 ConfigServerGame::Data* ConfigServerGame::data;

engine/server/library/serverGame/src/shared/core/NameManager.cpp

@@ -23,6 +23,8 @@
 #include "sharedUtility/DataTableManager.h"
 #include "sharedUtility/NameGenerator.h"
 
+#include <algorithm>
+
 // ======================================================================
 
 NameManager *NameManager::ms_instance = NULL;

engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp

@@ -12,6 +12,8 @@
 #include "Archive/Archive.h"
 #include "sharedFoundation/NetworkIdArchive.h"
 
+#include <algorithm>
+
 // ======================================================================
 
 namespace Archive

engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp

@@ -18,7 +18,8 @@
 #include "sharedObject/ObjectTemplateList.h"
 //@BEGIN TFD TEMPLATE REFS
 //@END TFD TEMPLATE REFS
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 
 const std::string DefaultString("");
 const StringId DefaultStringId("", 0);

engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp

@@ -18,7 +18,8 @@
 #include "sharedObject/ObjectTemplateList.h"
 //@BEGIN TFD TEMPLATE REFS
 //@END TFD TEMPLATE REFS
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 
 const std::string DefaultString("");
 const StringId DefaultStringId("", 0);

engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp

@@ -19,7 +19,8 @@
 //@BEGIN TFD TEMPLATE REFS
 #include "ServerObjectTemplate.h"
 //@END TFD TEMPLATE REFS
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 
 #include <unordered_map>
 

engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp

@@ -19,7 +19,8 @@
 //#include "serverGame/XpManagerObject.h"
 //@BEGIN TFD TEMPLATE REFS
 //@END TFD TEMPLATE REFS
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 
 const std::string DefaultString("");
 const StringId DefaultStringId("", 0);

engine/server/library/serverGame/src/shared/space/SpacePath.cpp

@@ -13,8 +13,10 @@
 #include "sharedDebug/Profiler.h"
 #include "sharedLog/Log.h"
 
+#include <algorithm>
 #include <vector>
 #include <map>
+#include <cstdio>
 
 // ======================================================================
 //

engine/server/library/serverMetrics/src/shared/MetricsData.cpp

@@ -10,6 +10,7 @@
 #include "sharedFoundation/ConfigFile.h"
 #include "sharedFoundation/Os.h"
 
+#include <algorithm>
 #include <vector>
 
 //---------------------------------------------
@@ -46,7 +47,7 @@ m_frameTimeHistoryTotalTime(0.0f)
 	{
 		m_frameTimeHistorySize = 1;
 	}
-	m_frameTimeHistory.reserve(m_frameTimeHistorySize);
+	m_frameTimeHistory.resize(m_frameTimeHistorySize);
 	for (int i = 0; i < m_frameTimeHistorySize; ++i)
 	{
 		m_frameTimeHistory[i] = 0.0f;