TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1377 from Azaezel/hash_map

Browse source 
From Dušan Jocić: convexDecomp vs2015+ compatibility patch
This commit is contained in:
Areloch 2015-08-26 00:31:45 -05:00
commit 6fe55b9f47
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/lib/convexDecomp/NvRemoveTjunctions.cpp
View file

@ -60,8 +60,12 @@ NvRemoveTjunctions.cpp : A code snippet to remove tjunctions from a triangle mes
#include <vector> #include <vector>
#ifdef __APPLE__ #ifdef __APPLE__
#include <ext/hash_map> #include <ext/hash_map>
#else #elif LINUX
#include <hash_map> #include <hash_map>
#elif _MSC_VER < 1500
#include <hash_map>
#elif _MSC_VER > 1800
#include <unordered_map>
#endif #endif
#include "NvUserMemAlloc.h" #include "NvUserMemAlloc.h"
#include "NvHashMap.h" #include "NvHashMap.h"