diff options
| author | RevoluPowered <gordon@gordonite.tech> | 2019-11-05 17:06:06 +0000 |
|---|---|---|
| committer | RevoluPowered <gordon@gordonite.tech> | 2019-11-05 20:38:26 +0000 |
| commit | 5fb160c7c692c469488f11aca90a36ac3248dfee (patch) | |
| tree | d1eba0971b63f8f8e39e6f2752fc8d9944960318 /thirdparty/assimp/code/FBX/FBXCompileConfig.h | |
| parent | 0bd877780fb7b344b5ed1d2fa7765078616f069b (diff) | |
| download | redot-engine-5fb160c7c692c469488f11aca90a36ac3248dfee.tar.gz | |
Updated assimp to 308db73 from https://github.com/assimp/assimp/
Diffstat (limited to 'thirdparty/assimp/code/FBX/FBXCompileConfig.h')
| -rw-r--r-- | thirdparty/assimp/code/FBX/FBXCompileConfig.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/thirdparty/assimp/code/FBX/FBXCompileConfig.h b/thirdparty/assimp/code/FBX/FBXCompileConfig.h index 3a3841fa5b..03536a1823 100644 --- a/thirdparty/assimp/code/FBX/FBXCompileConfig.h +++ b/thirdparty/assimp/code/FBX/FBXCompileConfig.h @@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define INCLUDED_AI_FBX_COMPILECONFIG_H #include <map> +#include <set> // #if _MSC_VER > 1500 || (defined __GNUC___) @@ -54,16 +55,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # else # define fbx_unordered_map map # define fbx_unordered_multimap multimap +# define fbx_unordered_set set +# define fbx_unordered_multiset multiset #endif #ifdef ASSIMP_FBX_USE_UNORDERED_MULTIMAP # include <unordered_map> +# include <unordered_set> # if _MSC_VER > 1600 # define fbx_unordered_map unordered_map # define fbx_unordered_multimap unordered_multimap +# define fbx_unordered_set unordered_set +# define fbx_unordered_multiset unordered_multiset # else # define fbx_unordered_map tr1::unordered_map # define fbx_unordered_multimap tr1::unordered_multimap +# define fbx_unordered_set tr1::unordered_set +# define fbx_unordered_multiset tr1::unordered_multiset # endif #endif |