Merge pull request #1099 from asmaloney/warning_fixes

Fixes two type warnings and a missing case option
This commit is contained in:
Kim Kulling
2016-12-08 17:49:36 +01:00
committed by GitHub
3 changed files with 3 additions and 2 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -84,7 +84,7 @@ static const unsigned char chartype_table[ 256 ] = {
template<class T>
inline
bool isNumeric( const T in ) {
return ( chartype_table[ in ] == 1 );
return ( chartype_table[ static_cast<int>( in ) ] == 1 );
}
template<class T>