From b33d2f559b2754b20700627a9defe2e10e136f27 Mon Sep 17 00:00:00 2001 From: Steve Dudenhoeffer Date: Mon, 14 Apr 2008 19:56:31 +0000 Subject: [PATCH] Fixed the debug builds having NDEBUG defined, causing stuff like asserts not working properly --- amxmodx/Makefile | 4 ++-- amxmodx/amx.cpp | 2 +- amxmodx/debugger.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amxmodx/Makefile b/amxmodx/Makefile index c4020bc5..908e2b70 100755 --- a/amxmodx/Makefile +++ b/amxmodx/Makefile @@ -6,7 +6,7 @@ MM_ROOT = ../../metamod/metamod ### EDIT BELOW FOR OTHER PROJECTS ### -OPT_FLAGS = -O2 -fno-strict-aliasing -funroll-loops -s -fomit-frame-pointer -pipe +OPT_FLAGS = -O2 -fno-strict-aliasing -funroll-loops -s -fomit-frame-pointer -pipe -DNDEBUG DEBUG_FLAGS = -g -ggdb3 CPP = gcc-4.1 NAME = amxmodx @@ -49,7 +49,7 @@ ifeq "$(BINLOG)" "true" CFLAGS += -DBINLOG_ENABLED endif -CFLAGS += -DLINUX -DNDEBUG -DAMX_NOPROPLIST -fPIC -Wall -Werror -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions +CFLAGS += -DLINUX -DAMX_NOPROPLIST -fPIC -Wall -Werror -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/amxmodx/amx.cpp b/amxmodx/amx.cpp index bd2167c0..f7347f53 100755 --- a/amxmodx/amx.cpp +++ b/amxmodx/amx.cpp @@ -803,7 +803,7 @@ static void expand(unsigned char *code, long codesize, long memsize) do { codesize--; /* no input byte should be shifted out completely */ - assert(shift<8*sizeof(cell)); + assert(shift(8*sizeof(cell))); /* we work from the end of a sequence backwards; the final code in * a sequence may not have the continuation bit set */ assert(shift>0 || (code[(size_t)codesize] & 0x80)==0); diff --git a/amxmodx/debugger.cpp b/amxmodx/debugger.cpp index e821fa4b..cc47c528 100755 --- a/amxmodx/debugger.cpp +++ b/amxmodx/debugger.cpp @@ -289,7 +289,7 @@ void Debugger::BeginExec() { Tracer *pTracer = new Tracer(); m_pCalls.push_back(pTracer); - assert(m_Top == (m_pCalls.size() - 1)); + assert(m_Top == static_cast(m_pCalls.size() - 1)); } m_pCalls[m_Top]->Reset();