From a487583946bfa391e5175514356d8613e9d57256 Mon Sep 17 00:00:00 2001
From: Azaezel <quillus@hotmail.com>
Date: Tue, 28 Jul 2015 18:42:20 -0500
Subject: [PATCH] =?UTF-8?q?From=20Du=C5=A1an=20Joci=C4=87:=20convexDecomp?=
 =?UTF-8?q?=20vs2015+=20compatibility=20patch=20(Verified=20with=20https:/?=
 =?UTF-8?q?/github.com/GarageGames/Torque3D/pull/1376=20for=20sub=20vs2015?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Engine/lib/convexDecomp/NvRemoveTjunctions.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Engine/lib/convexDecomp/NvRemoveTjunctions.cpp b/Engine/lib/convexDecomp/NvRemoveTjunctions.cpp
index f9ac21ce8..30631afcf 100644
--- a/Engine/lib/convexDecomp/NvRemoveTjunctions.cpp
+++ b/Engine/lib/convexDecomp/NvRemoveTjunctions.cpp
@@ -60,8 +60,12 @@ NvRemoveTjunctions.cpp : A code snippet to remove tjunctions from a triangle mes
 #include <vector>
 #ifdef __APPLE__
    #include <ext/hash_map>
-#else
+#elif LINUX
    #include <hash_map>
+#elif _MSC_VER < 1500
+   #include <hash_map>
+#elif _MSC_VER > 1800
+   #include <unordered_map>
 #endif
 #include "NvUserMemAlloc.h"
 #include "NvHashMap.h"