Merge branch 'master' into kimkulling/remove_unused_header_issue-5247

Update types.h
- closes https://github.com/assimp/assimp/issues/5247
2023-09-25 13:55:34 +02:00 · 2023-09-25 13:32:45 +02:00
1 changed files with 11 additions and 17 deletions
--- a/include/assimp/types.h
+++ b/include/assimp/types.h
@ -73,12 +73,6 @@ typedef uint32_t ai_uint32;
 #ifdef __cplusplus
 #ifdef ASSIMP_USE_HUNTER
 #   include <utf8.h>
 #else
 #   include "../contrib/utf8cpp/source/utf8.h"
 #endif
 #include <cstring>
 #include <new>    // for std::nothrow_t
 #include <string> // for aiString::Set(const std::string&)
Author	SHA1	Message	Date
Kim Kulling	98168e7b8f	Merge branch 'master' into kimkulling/remove_unused_header_issue-5247	2023-09-25 13:55:34 +02:00
Kim Kulling	7eb1bf59ee	Update types.h - closes https://github.com/assimp/assimp/issues/5247	2023-09-25 13:32:45 +02:00