thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Fix compilation of coroutines code when COROUTINE_DEBUG is defined

Browse source
This commit is contained in:
Paul Gilbert 2012-05-13 18:19:40 +10:00
parent 68b0412ce9
commit bd5b65f007
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/coroutines.cpp
View file

@ -21,6 +21,9 @@
#include "common/coroutines.h" #include "common/coroutines.h"
#include "common/algorithm.h" #include "common/algorithm.h"
#include "common/debug.h"
#include "common/hashmap.h"
#include "common/hash-str.h"
#include "common/system.h" #include "common/system.h"
#include "common/textconsole.h" #include "common/textconsole.h"
@ -32,7 +35,7 @@ CoroContext nullContext = NULL;
DECLARE_SINGLETON(CoroutineScheduler); DECLARE_SINGLETON(CoroutineScheduler);
#if COROUTINE_DEBUG #ifdef COROUTINE_DEBUG
namespace { namespace {
static int s_coroCount = 0; static int s_coroCount = 0;
@ -64,7 +67,7 @@ static void displayCoroStats() {
CoroBaseContext::CoroBaseContext(const char *func) CoroBaseContext::CoroBaseContext(const char *func)
: _line(0), _sleep(0), _subctx(0) { : _line(0), _sleep(0), _subctx(0) {
#if COROUTINE_DEBUG #ifdef COROUTINE_DEBUG
_funcName = func; _funcName = func;
changeCoroStats(_funcName, +1); changeCoroStats(_funcName, +1);
s_coroCount++; s_coroCount++;
@ -72,7 +75,7 @@ CoroBaseContext::CoroBaseContext(const char *func)
} }
CoroBaseContext::~CoroBaseContext() { CoroBaseContext::~CoroBaseContext() {
#if COROUTINE_DEBUG #ifdef COROUTINE_DEBUG
s_coroCount--; s_coroCount--;
changeCoroStats(_funcName, -1); changeCoroStats(_funcName, -1);
debug("Deleting coro in %s at %p (subctx %p)", debug("Deleting coro in %s at %p (subctx %p)",

4
common/coroutines.h
View file

@ -43,7 +43,7 @@ namespace Common {
// Enable this macro to enable some debugging support in the coroutine code. // Enable this macro to enable some debugging support in the coroutine code.
//#define COROUTINE_DEBUG 1 //#define COROUTINE_DEBUG
/** /**
* The core of any coroutine context which captures the 'state' of a coroutine. * The core of any coroutine context which captures the 'state' of a coroutine.
@ -53,7 +53,7 @@ struct CoroBaseContext {
int _line; int _line;
int _sleep; int _sleep;
CoroBaseContext *_subctx; CoroBaseContext *_subctx;
#if COROUTINE_DEBUG #ifdef COROUTINE_DEBUG
const char *_funcName; const char *_funcName;
#endif #endif
CoroBaseContext(const char *func); CoroBaseContext(const char *func);