From cf6e07b1ec52fd1b3af4e8b7d6315601395d651f Mon Sep 17 00:00:00 2001 From: Syoyo Fujita Date: Tue, 21 Jun 2016 21:18:12 +0900 Subject: [PATCH] Suppress clang compiler warnings. --- loader_example.cc | 2 +- tiny_gltf_loader.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/loader_example.cc b/loader_example.cc index aec14d5..6cb730d 100644 --- a/loader_example.cc +++ b/loader_example.cc @@ -566,7 +566,7 @@ static void Dump(const tinygltf::Scene &scene) { it->second.source.end()); for (; sourceIt != sourceItEnd; ++sourceIt) { - shader_source += *sourceIt; + shader_source += static_cast(*sourceIt); if (*sourceIt == '\n') { shader_source += Indent(3); } diff --git a/tiny_gltf_loader.h b/tiny_gltf_loader.h index cf2c950..7067cdf 100644 --- a/tiny_gltf_loader.h +++ b/tiny_gltf_loader.h @@ -168,6 +168,7 @@ typedef struct { int wrapS; int wrapT; int wrapR; // TinyGLTF extension + int pad0; } Sampler; typedef struct { @@ -277,6 +278,7 @@ typedef struct { typedef struct { std::string name; int type; + int pad0; std::vector source; } Shader; @@ -289,9 +291,11 @@ typedef struct { typedef struct { int count; + int pad0; std::string node; std::string semantic; int type; + int pad1; Parameter value; } TechniqueParameter;