ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add required casts for clang/llvm -Wc++11-narrowing"

Browse source
This commit is contained in:
Chih-Hung Hsieh 2015-01-13 17:38:06 +00:00 • committed by Gerrit Code Review
commit ce1928e987
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/utils/Mutex.h
View file

@ -131,8 +131,8 @@ inline status_t Mutex::tryLock() {
#if HAVE_ANDROID_OS #if HAVE_ANDROID_OS
inline status_t Mutex::timedLock(nsecs_t timeoutNs) { inline status_t Mutex::timedLock(nsecs_t timeoutNs) {
const struct timespec ts = { const struct timespec ts = {
/* .tv_sec = */ timeoutNs / 1000000000, /* .tv_sec = */ static_cast<time_t>(timeoutNs / 1000000000),
/* .tv_nsec = */ timeoutNs % 1000000000, /* .tv_nsec = */ static_cast<long>(timeoutNs % 1000000000),
}; };
return -pthread_mutex_timedlock(&mMutex, &ts); return -pthread_mutex_timedlock(&mMutex, &ts);
} }