From 96a0bee65102e2c3abc789fdcda419c3a012204e Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sat, 23 Apr 2016 21:00:35 -0500 Subject: [PATCH] Quiet two more warnings from GCC --- src/fragglescript/t_func.cpp | 2 +- src/thingdef/thingdef_expression.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp index 5d4320a4f..f8648808d 100644 --- a/src/fragglescript/t_func.cpp +++ b/src/fragglescript/t_func.cpp @@ -2185,7 +2185,7 @@ void FParser::SF_SetLineMonsterBlocking(void) { if (CheckArgs(2)) { - int blocking = intvalue(t_argv[1]) ? ML_BLOCKMONSTERS : 0; + int blocking = intvalue(t_argv[1]) ? (int)ML_BLOCKMONSTERS : 0; int tag=intvalue(t_argv[0]); FLineIdIterator itr(tag); diff --git a/src/thingdef/thingdef_expression.cpp b/src/thingdef/thingdef_expression.cpp index 8ca02b422..c888f97d5 100644 --- a/src/thingdef/thingdef_expression.cpp +++ b/src/thingdef/thingdef_expression.cpp @@ -3137,7 +3137,7 @@ ExpEmit FxArrayElement::Emit(VMFunctionBuilder *build) { shiftbits++; } - assert(1 << shiftbits == arraytype->ElementSize && "Element sizes other than power of 2 are not implemented"); + assert(1u << shiftbits == arraytype->ElementSize && "Element sizes other than power of 2 are not implemented"); build->Emit(OP_BOUND, indexv.RegNum, arraytype->ElementCount); if (shiftbits > 0) {