diff options
| author | Yang Ni <yangni@google.com> | 2015-02-14 18:00:59 -0800 |
|---|---|---|
| committer | Yang Ni <yangni@google.com> | 2015-02-15 20:10:40 +0000 |
| commit | b8353c5943f4038fd7f08db3d958390ce9418798 (patch) | |
| tree | 2cfac49d1f790e077f40dfc7ba42904ee5658f50 /rsElement.h | |
| parent | 1ce0dfd82311d4922dbffdde302599410fc25c5d (diff) | |
| download | rs-b8353c5943f4038fd7f08db3d958390ce9418798.tar.gz | |
Revert "Replaced android::Vector with std::vector."
b/19148482
This reverts commit 93d6bc872b7d9fba63abfa7513d56b38d9c3d371.
I also made some changes to Make it work with HEAD.
Change-Id: I5e516976ec1d85ffe1cf388c01795348a9441982
Diffstat (limited to 'rsElement.h')
| -rw-r--r-- | rsElement.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rsElement.h b/rsElement.h index ccf69eb5..9374c64a 100644 --- a/rsElement.h +++ b/rsElement.h @@ -17,8 +17,6 @@ #ifndef ANDROID_STRUCTURED_ELEMENT_H #define ANDROID_STRUCTURED_ELEMENT_H -#include <vector> - #include "rsComponent.h" #include "rsUtils.h" #include "rsInternalDefines.h" @@ -172,7 +170,7 @@ public: ~ElementState(); // Cache of all existing elements. - std::vector<Element *> mElements; + Vector<Element *> mElements; }; |