From 82ccb687e48325ef53bf4335ad569e4bcec4acdd Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 6 Feb 2006 23:04:31 +0000 Subject: [PATCH] oops --- panda/src/pstatclient/pStatThread.cxx | 4 ++++ panda/src/putil/pipelineCyclerTrueImpl.I | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/panda/src/pstatclient/pStatThread.cxx b/panda/src/pstatclient/pStatThread.cxx index b305c43d93..f0d2e04119 100644 --- a/panda/src/pstatclient/pStatThread.cxx +++ b/panda/src/pstatclient/pStatThread.cxx @@ -27,5 +27,9 @@ //////////////////////////////////////////////////////////////////// Thread *PStatThread:: get_thread() const { +#ifdef DO_PSTATS return _client->get_thread_object(_index); +#else + return Thread::get_current_thread(); +#endif } diff --git a/panda/src/putil/pipelineCyclerTrueImpl.I b/panda/src/putil/pipelineCyclerTrueImpl.I index ff4418f087..bf9b9d85c0 100644 --- a/panda/src/putil/pipelineCyclerTrueImpl.I +++ b/panda/src/putil/pipelineCyclerTrueImpl.I @@ -117,7 +117,7 @@ INLINE void PipelineCyclerTrueImpl:: release_write(CycleData *pointer) { #ifdef NDEBUG int pipeline_stage = Thread::get_current_thread()->get_pipeline_stage(); - return release_write_stage(pipeline_stage); + return release_write_stage(pipeline_stage, pointer); #else _lock.release(); #endif