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

Merge pull request #3688 from gongminmin/FixClangCL 

Fix compiling issues in clang-cl
pull/3689/head^2
Kim Kulling 2021-03-12 15:49:11 +01:00 committed by GitHub
parent 47d36cdb97 84cd1d95c7
commit 383dfae79b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/AC/ACLoader.h
View File

@ -116,7 +116,7 @@ public:
Mask = 0xf, Mask = 0xf,
}; };
inline const uint8_t GetType() const { return (flags & Mask); } inline uint8_t GetType() const { return (flags & Mask); }
}; };
// Represents an AC3D object // Represents an AC3D object

8
include/assimp/Exceptional.h
View File

@ -75,6 +75,10 @@ public:
template<typename... T> template<typename... T>
explicit DeadlyImportError(T&&... args) : explicit DeadlyImportError(T&&... args) :
DeadlyErrorBase(Assimp::Formatter::format(), std::forward<T>(args)...) {} DeadlyErrorBase(Assimp::Formatter::format(), std::forward<T>(args)...) {}
#if defined(_MSC_VER) && defined(__clang__)
DeadlyImportError(DeadlyImportError& other) = delete;
#endif
}; };
class ASSIMP_API DeadlyExportError : public DeadlyErrorBase { class ASSIMP_API DeadlyExportError : public DeadlyErrorBase {
@ -83,6 +87,10 @@ public:
template<typename... T> template<typename... T>
explicit DeadlyExportError(T&&... args) : explicit DeadlyExportError(T&&... args) :
DeadlyErrorBase(Assimp::Formatter::format(), std::forward<T>(args)...) {} DeadlyErrorBase(Assimp::Formatter::format(), std::forward<T>(args)...) {}
#if defined(_MSC_VER) && defined(__clang__)
DeadlyExportError(DeadlyExportError& other) = delete;
#endif
}; };
#ifdef _MSC_VER #ifdef _MSC_VER

2
include/assimp/metadata.h
View File

@ -351,7 +351,7 @@ struct aiMetadata {
*static_cast<T *>(mValues[index].mData) = value; *static_cast<T *>(mValues[index].mData) = value;
} else { } else {
if (nullptr != mValues[index].mData) { if (nullptr != mValues[index].mData) {
delete mValues[index].mData; delete static_cast<T *>(mValues[index].mData);
mValues[index].mData = nullptr; mValues[index].mData = nullptr;
} }
mValues[index].mData = new T(value); mValues[index].mData = new T(value);