From 26eb3356226c18b7004c33009a9bdc2db42e5ff1 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 5 Feb 2016 16:07:18 -0600 Subject: [PATCH] Quiet a couple GCC warnings --- src/name.cpp | 2 +- src/p_lnspec.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/name.cpp b/src/name.cpp index 5ab361d42..359f3398c 100644 --- a/src/name.cpp +++ b/src/name.cpp @@ -182,7 +182,7 @@ void FName::NameManager::InitBuckets () // Register built-in names. 'None' must be name 0. for (size_t i = 0; i < countof(PredefinedNames); ++i) { - assert((NULL == FindName(PredefinedNames[i], true)) && "Predefined name already inserted"); + assert((0 == FindName(PredefinedNames[i], true)) && "Predefined name already inserted"); FindName (PredefinedNames[i], false); } } diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 1e1f76923..c74378f61 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -3777,7 +3777,7 @@ int P_ExecuteSpecial(int num, int arg4, int arg5) { - if (num >= 0 && num < countof(LineSpecials)) + if (num >= 0 && num < (int)countof(LineSpecials)) { return LineSpecials[num](line, activator, backSide, arg1, arg2, arg3, arg4, arg5); }