commit bef837dc57b47fd7fcc17c86d741cf77eac4487b
author John Reck <jreck@google.com> Wed Jul 29 16:51:05 2015 -0700
committer John Reck <jreck@google.com> Thu Jul 30 09:51:57 2015 -0700
tree bb446a9aa98f59fbcd17a64537786210418aaaef
parent 272a685f17cc4828257e521a6f62b7b17870f75e

Remove the rest of utils/Vector.h usage

Change-Id: I90ab2c17ba1903a8241cba7f623b74ed136dd845

libs/hwui/LayerCache.h

diff --git a/libs/hwui/LayerCache.h b/libs/hwui/LayerCache.h
index 7d17b9b..6fe7b3a 100644
--- a/libs/hwui/LayerCache.h
+++ b/libs/hwui/LayerCache.h
@@ -19,7 +19,8 @@
 
 #include "Debug.h"
 #include "Layer.h"
-#include "utils/SortedList.h"
+
+#include <set>
 
 namespace android {
 namespace uirenderer {
@@ -118,12 +119,8 @@
             return compare(*this, other) != 0;
         }
 
-        friend inline int strictly_order_type(const LayerEntry& lhs, const LayerEntry& rhs) {
-            return LayerEntry::compare(lhs, rhs) < 0;
-        }
-
-        friend inline int compare_type(const LayerEntry& lhs, const LayerEntry& rhs) {
-            return LayerEntry::compare(lhs, rhs);
+        bool operator<(const LayerEntry& other) const {
+            return LayerEntry::compare(*this, other) < 0;
         }
 
         Layer* mLayer;
@@ -133,7 +130,7 @@
 
     void deleteLayer(Layer* layer);
 
-    SortedList<LayerEntry> mCache;
+    std::multiset<LayerEntry> mCache;
 
     uint32_t mSize;
     uint32_t mMaxSize;