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 /rsFileA3D.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 'rsFileA3D.h')
| -rw-r--r-- | rsFileA3D.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rsFileA3D.h b/rsFileA3D.h index 0c8b3d67..8bf36b97 100644 --- a/rsFileA3D.h +++ b/rsFileA3D.h @@ -88,13 +88,15 @@ protected: Asset *mAsset; OStream *mWriteStream; - std::vector<A3DIndexEntry*> mWriteIndex; + Vector<A3DIndexEntry*> mWriteIndex; IStream *mReadStream; - std::vector<A3DIndexEntry*> mIndex; + Vector<A3DIndexEntry*> mIndex; }; } } #endif //ANDROID_RS_FILE_A3D_H + + |