diff options
| author | Nick Kralevich <nnk@google.com> | 2014-01-11 05:51:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-11 05:51:27 +0000 |
| commit | aaa42e57797db140ead1068dce6340ffd33fa005 (patch) | |
| tree | 3a42c6ef70959a6528b2706f06d517cf767ca8db /media/libnbaio | |
| parent | 03f696e3eb89c0642f9a2b761ff2cfc6af003d16 (diff) | |
| parent | 081559cc5afb6c8f2f9847e1de739f66a5a07a6b (diff) | |
| download | frameworks_av-aaa42e57797db140ead1068dce6340ffd33fa005.zip frameworks_av-aaa42e57797db140ead1068dce6340ffd33fa005.tar.gz frameworks_av-aaa42e57797db140ead1068dce6340ffd33fa005.tar.bz2 | |
am 081559cc: am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing"
* commit '081559cc5afb6c8f2f9847e1de739f66a5a07a6b':
Fix c++11 narrowing
Diffstat (limited to 'media/libnbaio')
| -rw-r--r-- | media/libnbaio/MonoPipe.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libnbaio/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp index de0ad28..3c61b60 100644 --- a/media/libnbaio/MonoPipe.cpp +++ b/media/libnbaio/MonoPipe.cpp @@ -183,7 +183,7 @@ ssize_t MonoPipe::write(const void *buffer, size_t count) } } if (ns > 0) { - const struct timespec req = {0, ns}; + const struct timespec req = {0, static_cast<long>(ns)}; nanosleep(&req, NULL); } // record the time that this write() completed |