commit dce5c559712031b3cb8039067819c11c1a4e16f9
author Pablo Ceballos <pceballos@google.com> Wed Feb 10 15:43:22 2016 -0800
committer Pablo Ceballos <pceballos@google.com> Wed Feb 10 15:43:22 2016 -0800
tree 6ed8962d6919df5cd10dabef0581eb446da3f4d6
parent c5cec281654c5dee2273ce4bebd3a749c3a1119e

BQ: Fix iterator use

Don't use an iterator after it's been removed from the container.

Change-Id: I374b454bba95d10dcec6a600bf8f16e5636e426b

libs/gui/BufferQueueProducer.cpp

diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 9d42464..136a14a 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -222,9 +222,9 @@
     if (mCore->mFreeSlots.empty()) {
         return BufferQueueCore::INVALID_BUFFER_SLOT;
     }
-    auto slot = mCore->mFreeSlots.begin();
+    int slot = *(mCore->mFreeSlots.begin());
     mCore->mFreeSlots.erase(slot);
-    return *slot;
+    return slot;
 }
 
 status_t BufferQueueProducer::waitForFreeSlotThenRelock(FreeSlotCaller caller,