Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev

This commit is contained in:
Jason Simmons 2012-10-25 18:03:50 -07:00 committed by Android (Google) Code Review
commit 78b4977efd

View File

@ -188,7 +188,8 @@ public:
inline void push_back(const TYPE& item) { insertAt(item, size(), 1); }
inline void push_front(const TYPE& item) { insertAt(item, 0, 1); }
inline iterator erase(iterator pos) {
return begin() + removeItemsAt(pos-array());
ssize_t index = removeItemsAt(pos-array());
return begin() + index;
}
protected: