v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typo in M3DWrapper.cpp 

Don't use std::mutex if not supported.
Allow override to force it to be used if does in fact exist
Thank you CI
pull/2805/head
RichardTea 2019-12-03 14:15:50 +00:00
parent ee537b70ad
commit 45a96af9ac
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/M3D/M3DWrapper.cpp
View File

@ -48,16 +48,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/IOStreamBuffer.h> #include <assimp/IOStreamBuffer.h>
#include <assimp/ai_assert.h> #include <assimp/ai_assert.h>
#if (__cplusplus >= 201103L) || (_MSC_VER >= 1915) || defined(AI_M3D_USE_STDMUTEX) // C++11 and MSVC that mostly supports it #ifndef AI_M3D_USE_STDMUTEX
#define AI_M3D_USE_STDMUTEX #if (__cplusplus >= 201103L) || (_MSC_VER >= 1900) // C++11 and MSVC 2015 onwards
#define AI_M3D_USE_STDMUTEX 1
#else
#define AI_M3D_USE_STDMUTEX 0
#endif
#endif
#if AI_M3D_USE_STDMUTEX
#include <mutex> #include <mutex>
std::mutex file_mutex;
#endif #endif
// workaround: the M3D SDK expects a C callback, but we want to use Assimp::IOSystem to implement that // workaround: the M3D SDK expects a C callback, but we want to use Assimp::IOSystem to implement that
// This makes it non-rentrant so lock a mutex (requires C++11) // This makes it non-rentrant so lock a mutex (requires C++11)
std::mutex file_mutex;
extern "C" { extern "C" {
void *m3dimporter_pIOHandler; void *m3dimporter_pIOHandler;
@ -94,7 +100,7 @@ M3DWrapper::M3DWrapper() {
} }
M3DWrapper::M3DWrapper(IOSystem *pIOHandler, const std::vector<unsigned char> &buffer) { M3DWrapper::M3DWrapper(IOSystem *pIOHandler, const std::vector<unsigned char> &buffer) {
#ifdef AI_M3D_USE_STDMUTEX #if AI_M3D_USE_STDMUTEX
// M3D is NOT thread-safe, so lock the global mutex // M3D is NOT thread-safe, so lock the global mutex
const std::lock_guard<std::mutex> lock(file_mutex); const std::lock_guard<std::mutex> lock(file_mutex);
#endif #endif