summaryrefslogtreecommitdiff
path: root/libs/rs/rsContext.cpp
diff options
context:
space:
mode:
author Stephen Hines <srhines@google.com> 2011-03-03 16:14:00 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-03-03 16:14:00 -0800
commit6e71c954faff34b78a2952436b4f48d84a8c20cd (patch)
treee7e35a26c22f3ff6a00a739608aa9e82e8f2efb8 /libs/rs/rsContext.cpp
parent389bf4f734f1820e31f8807d117b6b15ded9ff8b (diff)
parent1bf1f8df178170ee3d4224f3c92a1b724d783178 (diff)
Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
Diffstat (limited to 'libs/rs/rsContext.cpp')
-rw-r--r--libs/rs/rsContext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 2e6ea1243d9c..4a5620d098fc 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -741,7 +741,7 @@ Context::~Context() {
mWorkers.mLaunchSignals[ct].set();
}
for (uint32_t ct = 0; ct < mWorkers.mCount; ct++) {
- int status = pthread_join(mWorkers.mThreadId[ct], &res);
+ status = pthread_join(mWorkers.mThreadId[ct], &res);
}
rsAssert(!mWorkers.mRunningCount);