diff options
author | Wale Ogunwale <ogunwale@google.com> | 2015-04-22 00:27:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 00:27:31 +0000 |
commit | 1c38c4192bdb3fc5d856e6882268f3d4b76032e3 (patch) | |
tree | 6e128e69439a8acbc43e149f0bd17c3028b8cf30 /libs/binder | |
parent | e893dddb3f6f84bfdbf875df643ad4b20fb77599 (diff) | |
parent | a3206e690bcfe5c982a0d7fff7c845b83a3ed91f (diff) | |
download | frameworks_native-1c38c4192bdb3fc5d856e6882268f3d4b76032e3.zip frameworks_native-1c38c4192bdb3fc5d856e6882268f3d4b76032e3.tar.gz frameworks_native-1c38c4192bdb3fc5d856e6882268f3d4b76032e3.tar.bz2 |
Merge "Fixed build error with clang/llvm."
Diffstat (limited to 'libs/binder')
-rw-r--r-- | libs/binder/IPCThreadState.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 2baf474..ef88181 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -403,8 +403,9 @@ void IPCThreadState::blockUntilThreadAvailable() { pthread_mutex_lock(&mProcess->mThreadCountLock); while (mProcess->mExecutingThreadsCount >= mProcess->mMaxThreads) { - ALOGW("Waiting for thread to be free. mExecutingThreadsCount=%i mMaxThreads=%i\n", - mProcess->mExecutingThreadsCount, mProcess->mMaxThreads); + ALOGW("Waiting for thread to be free. mExecutingThreadsCount=%lu mMaxThreads=%lu\n", + static_cast<unsigned long>(mProcess->mExecutingThreadsCount), + static_cast<unsigned long>(mProcess->mMaxThreads)); pthread_cond_wait(&mProcess->mThreadCountDecrement, &mProcess->mThreadCountLock); } pthread_mutex_unlock(&mProcess->mThreadCountLock); |