ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 40cd4515: am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev

Browse Source 
* commit '40cd45151513ecc02c95e0cc1b40480dd816cdd4':
  Ensure that Vector::erase() returns a valid iterator
This commit is contained in:
Jason Simmons 2012-10-25 18:08:03 -07:00 committed by Android Git Automerger
commit 7e4eb72ad8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/utils/Vector.h
View File

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