From 3c5f1578c219dc13806c46cad3af2529dd9d99c7 Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Wed, 7 Dec 2016 20:30:45 -0500 Subject: [PATCH] Fixes two type warnings and a missing case option --- code/AssxmlExporter.cpp | 2 +- code/ColladaExporter.cpp | 1 + .../openddlparser/include/openddlparser/OpenDDLParserUtils.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/AssxmlExporter.cpp b/code/AssxmlExporter.cpp index e236df664..c50f1985b 100644 --- a/code/AssxmlExporter.cpp +++ b/code/AssxmlExporter.cpp @@ -72,7 +72,7 @@ static int ioprintf( IOStream * io, const char *format, ... ) { return -1; } - static const size_t Size = 4096; + static const int Size = 4096; char sz[ Size ]; ::memset( sz, '\0', Size ); va_list va; diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp index c22b746fb..6c576a12d 100644 --- a/code/ColladaExporter.cpp +++ b/code/ColladaExporter.cpp @@ -384,6 +384,7 @@ void ColladaExporter::WriteLight(size_t pIndex){ case aiLightSource_SPOT: WriteSpotLight(light); break; + case aiLightSource_AREA: case aiLightSource_UNDEFINED: case _aiLightSource_Force32Bit: break; diff --git a/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h b/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h index 880e4c0b3..778a1b46e 100644 --- a/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h +++ b/contrib/openddlparser/include/openddlparser/OpenDDLParserUtils.h @@ -84,7 +84,7 @@ static const unsigned char chartype_table[ 256 ] = { template inline bool isNumeric( const T in ) { - return ( chartype_table[ in ] == 1 ); + return ( chartype_table[ static_cast( in ) ] == 1 ); } template