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

Disable draco clang/gcc warnings via pragma 

draco templated functions also throw warnings
pull/3614/head
RichardTea 2021-01-27 09:19:35 +00:00
parent 0c49cddae6
commit 5b9d06c2fc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/AssetLib/glTF2/glTF2Asset.inl
View File

@ -47,9 +47,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/MemoryIOWrapper.h> #include <assimp/MemoryIOWrapper.h>
#ifdef ASSIMP_ENABLE_DRACO #ifdef ASSIMP_ENABLE_DRACO
#include "draco/draco_features.h"
#include "draco/compression/decode.h" #include "draco/compression/decode.h"
#include "draco/core/decoder_buffer.h" #include "draco/core/decoder_buffer.h"
#include "draco/draco_features.h"
#ifndef DRACO_MESH_COMPRESSION_SUPPORTED #ifndef DRACO_MESH_COMPRESSION_SUPPORTED
#error glTF: KHR_draco_mesh_compression: draco library must have DRACO_MESH_COMPRESSION_SUPPORTED #error glTF: KHR_draco_mesh_compression: draco library must have DRACO_MESH_COMPRESSION_SUPPORTED
#endif #endif
@ -190,6 +190,14 @@ inline Value *FindObject(Value &val, const char *id) {
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 4018) // Signed/unsigned mismatch #pragma warning(disable: 4018) // Signed/unsigned mismatch
#pragma warning(disable: 4804) // Unsafe use of type 'bool' #pragma warning(disable: 4804) // Unsafe use of type 'bool'
#elif defined(__clang__)
#pragma diagnostic push
#pragma clang diagnostic ignored "-Wbool-compare"
#pragma clang diagnostic ignored "-Wsign-compare"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wbool-compare"
#pragma GCC diagnostic ignored "-Wsign-compare"
#endif #endif
template <typename T> template <typename T>
@ -276,9 +284,13 @@ inline void SetDecodedAttributeBuffer_Draco(const draco::Mesh &dracoMesh, uint32
#if _MSC_VER #if _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#elif defined(__clang__)
#pragma diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif #endif
#endif #endif // ASSIMP_ENABLE_DRACO
// //
// LazyDict methods // LazyDict methods