Disable Cancelable copy constructor (#3185)

* Disable Cancelable copy constructor
project-chip · Oct 13, 2020 · 161de66 · 161de66
1 parent 9c938e2
commit 161de66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/core/CHIPCallback.h b/src/lib/core/CHIPCallback.h
@@ -82,6 +82,8 @@ class Cancelable
         return this;
     }
     ~Cancelable() { Cancel(); }
+
+    Cancelable(const Cancelable &) = delete;
 };
 
 typedef void (*CallFn)(void *);
@@ -186,10 +188,8 @@ class CallbackDeque : public Cancelable
     /**
      * @brief dequeue, but don't cancel, all cas that match the by()
      */
-    Cancelable DequeueBy(bool (*by)(uint64_t, const Cancelable *), uint64_t p)
+    void DequeueBy(bool (*by)(uint64_t, const Cancelable *), uint64_t p, Cancelable & dequeued)
     {
-        Cancelable dequeued;
-
         for (Cancelable * ca = mNext; ca != this;)
         {
             Cancelable * next = ca->mNext;
@@ -200,7 +200,6 @@ class CallbackDeque : public Cancelable
             }
             ca = next;
         }
-        return dequeued;
     }
 
     /**

diff --git a/src/system/SystemLayer.cpp b/src/system/SystemLayer.cpp
@@ -564,7 +564,10 @@ Error Layer::SetClock_RealTime(uint64_t newCurTime)
 void Layer::DispatchTimerCallbacks(const uint64_t kCurrentEpoch)
 {
     // dispatch TimerCallbacks
-    Cancelable ready = mTimerCallbacks.DequeueBy(TimerReady, kCurrentEpoch);
+    Cancelable ready;
+
+    mTimerCallbacks.DequeueBy(TimerReady, kCurrentEpoch, ready);
+
     while (ready.mNext != &ready)
     {
         // one-shot