Fabric: Explicit clearing std::vector after moving from it

shergin · facebook-github-bot · commit 3110a6704703 · 2018-11-06T11:03:50.000-08:00
Summary: Apparently, the standard does not guarantee that the vector is empty after moving from it. So, let's clear it explicitly instead of asserting the emptiness.

Reviewed By: sahrens

Differential Revision: D12837227

fbshipit-source-id: 85dff6848707f4204f4c79be173064547e83c63e
diff --git a/ReactCommon/fabric/events/EventBeatBasedExecutor.cpp b/ReactCommon/fabric/events/EventBeatBasedExecutor.cpp
@@ -62,7 +62,7 @@ void EventBeatBasedExecutor::onBeat(bool success) const {
     }
 
     tasks = std::move(tasks_);
-    assert(tasks_.size() == 0);
+    tasks_.clear();
   }
 
   for (const auto task : tasks) {
diff --git a/ReactCommon/fabric/events/EventQueue.cpp b/ReactCommon/fabric/events/EventQueue.cpp
@@ -35,7 +35,7 @@ void EventQueue::onBeat() const {
     }
 
     queue = std::move(queue_);
-    assert(queue_.size() == 0);
+    queue_.clear();
   }
 
   {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ void EventBeatBasedExecutor::onBeat(bool success) const {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`tasks = std::move(tasks_);`
`65`		`- assert(tasks_.size() == 0);`
	`65`	`+ tasks_.clear();`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`for (const auto task : tasks) {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void EventQueue::onBeat() const {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`queue = std::move(queue_);`
`38`		`- assert(queue_.size() == 0);`
	`38`	`+ queue_.clear();`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`{`