From b315bac97fd1364953a2da3b96c5251f60b9a6f7 Mon Sep 17 00:00:00 2001 From: Dell-Ray Sackett Date: Thu, 1 Jun 2017 21:05:49 -0700 Subject: [PATCH 1/2] Change boolean to bool void DemodulatorMgr::garbageCollect(boolean forcedGC) should be void DemodulatorMgr::garbageCollect(bool forcedGC) --- src/demod/DemodulatorMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/demod/DemodulatorMgr.cpp b/src/demod/DemodulatorMgr.cpp index 2eeffb1..7f0cd14 100644 --- a/src/demod/DemodulatorMgr.cpp +++ b/src/demod/DemodulatorMgr.cpp @@ -278,7 +278,7 @@ DemodulatorInstance *DemodulatorMgr::getLastDemodulatorWith(const std::string& t return nullptr; } -void DemodulatorMgr::garbageCollect(boolean forcedGC) { +void DemodulatorMgr::garbageCollect(bool forcedGC) { std::lock_guard < std::mutex > lock(deleted_demods_busy); From ab6cb059b973572fcda2226ef177a281c76f14db Mon Sep 17 00:00:00 2001 From: Dell-Ray Sackett Date: Thu, 1 Jun 2017 21:12:06 -0700 Subject: [PATCH 2/2] boolean not a valid keyword changed boolean to bool in garbageCollect --- src/demod/DemodulatorMgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/demod/DemodulatorMgr.h b/src/demod/DemodulatorMgr.h index 42032dc..906a9d7 100644 --- a/src/demod/DemodulatorMgr.h +++ b/src/demod/DemodulatorMgr.h @@ -73,7 +73,7 @@ public: //all deleted demodulators are effectively GCed. //else: (default) the method test for effective termination //and GC one demod per call. - void garbageCollect(boolean forcedGC = false); + void garbageCollect(bool forcedGC = false); private: