Removed STLport requirement

engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp

@@ -15,7 +15,7 @@
 #include <string>
 #include <algorithm>
 #include <cctype>
-#include <hash_map>
+#include <tr1/unordered_map>
 
 // ======================================================================
 
@@ -25,7 +25,7 @@ namespace CombatDataTableNamespace
 	std::string const cs_columnActionNameCrc("actionNameCrc");
 	int s_actionNameCrcColumn;
 
-	std::hash_map<uint32, int> s_commandsWithMinInvisLevelRequired;
+	std::tr1::unordered_map<uint32, int> s_commandsWithMinInvisLevelRequired;
 }
 
 using namespace CombatDataTableNamespace;
@@ -402,7 +402,7 @@ int CombatDataTable::getMinInvisLevelRequired(uint32 commandHash)
 	if(commandHash == 0)
 		return -1;
 
-	std::hash_map<uint32, int>::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash);
+	std::tr1::unordered_map<uint32, int>::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash);
 	if (it != s_commandsWithMinInvisLevelRequired.end())
 		return it->second;
 

engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp

@@ -15,6 +15,8 @@
 #include "sharedObject/ObjectTemplateList.h"
 #include "sharedUtility/DataTable.h"
 #include "sharedUtility/DataTableManager.h"
+
+#include <algorithm>
 #include <map>
 #include <vector>
 

engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.cpp

@@ -16,6 +16,7 @@
 
 #include "UnicodeUtils.h"
 
+#include <algorithm>
 #include <map>
 
 // ======================================================================

engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.cpp

@@ -223,7 +223,7 @@ void SharedBuildoutAreaManager::install()
 			int const areaCount = areaListTable.getNumRows();
 			for (int areaRow = 0; areaRow < areaCount; ++areaRow)
 			{
-				areasForScene.push_back();
+				areasForScene.push_back(BuildoutArea());
 				BuildoutArea &buildoutArea = areasForScene.back();
 				buildoutArea.areaIndex = i*100+areaRow;
 				buildoutArea.areaName = areaListTable.getStringValue("area", areaRow);

engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp

@@ -19,13 +19,13 @@
 #include "sharedMessageDispatch/Transceiver.h"
 #include "unicodeArchive/UnicodeArchive.h"
 #include "UnicodeUtils.h"
-#include <hash_map>
+#include <tr1/unordered_map>
 
 // ======================================================================
 
 namespace WaypointNamespace
 {
-	typedef std::hash_map<NetworkId, WaypointData *> WaypointMapById;
+	typedef std::tr1::unordered_map<NetworkId, WaypointData *> WaypointMapById;
 	WaypointMapById s_waypointMapById;
 	bool s_installed;
 
@@ -106,7 +106,7 @@ namespace Archive
 		if (networkId.isValid())
 		{
 			WaypointData *data = 0;
-			std::hash_map<NetworkId, WaypointData *>::iterator f = s_waypointMapById.find(networkId);
+			std::tr1::unordered_map<NetworkId, WaypointData *>::iterator f = s_waypointMapById.find(networkId);
 			if (f == s_waypointMapById.end())
 				data = new WaypointData(networkId);
 			else
@@ -331,7 +331,7 @@ std::string const &Waypoint::getColorNameById(uint8 id) // static
 Waypoint const Waypoint::getWaypointById(NetworkId const &id) // static
 {
 	Waypoint result;
-	std::hash_map<NetworkId, WaypointData *>::iterator f = s_waypointMapById.find(id);
+	std::tr1::unordered_map<NetworkId, WaypointData *>::iterator f = s_waypointMapById.find(id);
 	if (f != s_waypointMapById.end())
 		result.releaseData(f->second);
 	return result;

engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp

@@ -12,7 +12,7 @@
 
 #include "Unicode.h"
 
-#include <hash_map>
+#include <tr1/unordered_map>
 
 //======================================================================
 
@@ -273,7 +273,7 @@ namespace ShipChassisSlotTypeNamespace
 		static_cast<int>(ShipComponentType::SCT_weapon),           // SCST_weapon_99
 	};
 
-	typedef stdhash_map<std::string, ShipChassisSlotType::Type>::fwd SlotNameTypeMap;
+	typedef stdunordered_map<std::string, ShipChassisSlotType::Type>::fwd SlotNameTypeMap;
 	SlotNameTypeMap s_slotNameTypeMap;
 
 	bool s_installed = false;

engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp

@@ -8,7 +8,7 @@
 #include "sharedGame/FirstSharedGame.h"
 #include "sharedGame/ShipComponentType.h"
 
-#include <hash_map>
+#include <tr1/unordered_map>
 
 //======================================================================
 
@@ -48,7 +48,7 @@ namespace ShipComponentTypeNamespace
 		"mod_"
 	};
 
-	typedef stdhash_map<std::string, ShipComponentType::Type>::fwd ComponentNameTypeMap;
+	typedef stdunordered_map<std::string, ShipComponentType::Type>::fwd ComponentNameTypeMap;
 	ComponentNameTypeMap s_componentNameTypeMap;
 
 	bool s_installed = false;