Browse Source

Merge pull request #1377 from Azaezel/hash_map

From Dušan Jocić: convexDecomp vs2015+ compatibility patch
Areloch 10 years ago
parent
commit
6fe55b9f47
1 changed files with 5 additions and 1 deletions
  1. 5 1
      Engine/lib/convexDecomp/NvRemoveTjunctions.cpp

+ 5 - 1
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"