summaryrefslogtreecommitdiff
path: root/rsContext.h
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2015-02-14 18:00:59 -0800
committerYang Ni <yangni@google.com>2015-02-15 20:10:40 +0000
commitb8353c5943f4038fd7f08db3d958390ce9418798 (patch)
tree2cfac49d1f790e077f40dfc7ba42904ee5658f50 /rsContext.h
parent1ce0dfd82311d4922dbffdde302599410fc25c5d (diff)
downloadrs-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 'rsContext.h')
-rw-r--r--rsContext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/rsContext.h b/rsContext.h
index c3fc115e..3084a9a2 100644
--- a/rsContext.h
+++ b/rsContext.h
@@ -307,7 +307,7 @@ private:
bool mHasSurface;
bool mIsContextLite;
- std::vector<ObjectBase *> mNames;
+ Vector<ObjectBase *> mNames;
uint64_t mTimers[_RS_TIMER_TOTAL];
Timers mTimerActive;