From f6322d8c93cd402aa479b994b24129b8caefbede Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 30 Jan 2022 00:32:51 +0100 Subject: [PATCH] pipeline: De-inline ConditionVarDummyImpl methods This is the only ConditionVar implementation to import thread.h directly --- panda/src/pipeline/conditionVarDummyImpl.I | 16 ---------------- panda/src/pipeline/conditionVarDummyImpl.cxx | 17 +++++++++++++++++ panda/src/pipeline/conditionVarDummyImpl.h | 5 ++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/panda/src/pipeline/conditionVarDummyImpl.I b/panda/src/pipeline/conditionVarDummyImpl.I index ddb356bfe6..2ea7c39588 100644 --- a/panda/src/pipeline/conditionVarDummyImpl.I +++ b/panda/src/pipeline/conditionVarDummyImpl.I @@ -25,22 +25,6 @@ INLINE ConditionVarDummyImpl:: ~ConditionVarDummyImpl() { } -/** - * - */ -INLINE void ConditionVarDummyImpl:: -wait() { - Thread::force_yield(); -} - -/** - * - */ -INLINE void ConditionVarDummyImpl:: -wait(double) { - Thread::force_yield(); -} - /** * */ diff --git a/panda/src/pipeline/conditionVarDummyImpl.cxx b/panda/src/pipeline/conditionVarDummyImpl.cxx index 36dd47e659..815501d96f 100644 --- a/panda/src/pipeline/conditionVarDummyImpl.cxx +++ b/panda/src/pipeline/conditionVarDummyImpl.cxx @@ -13,3 +13,20 @@ #include "selectThreadImpl.h" #include "conditionVarDummyImpl.h" +#include "thread.h" + +/** + * + */ +void ConditionVarDummyImpl:: +wait() { + Thread::force_yield(); +} + +/** + * + */ +void ConditionVarDummyImpl:: +wait(double) { + Thread::force_yield(); +} diff --git a/panda/src/pipeline/conditionVarDummyImpl.h b/panda/src/pipeline/conditionVarDummyImpl.h index 150b77f910..c5e2b942c4 100644 --- a/panda/src/pipeline/conditionVarDummyImpl.h +++ b/panda/src/pipeline/conditionVarDummyImpl.h @@ -16,7 +16,6 @@ #include "pandabase.h" #include "selectThreadImpl.h" -#include "thread.h" #include "pnotify.h" @@ -31,8 +30,8 @@ public: INLINE ConditionVarDummyImpl(MutexDummyImpl &mutex); INLINE ~ConditionVarDummyImpl(); - INLINE void wait(); - INLINE void wait(double timeout); + void wait(); + void wait(double timeout); INLINE void notify(); INLINE void notify_all(); };