diff options
| author | Nick Kralevich <nnk@google.com> | 2014-01-11 05:48:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-11 05:48:40 +0000 |
| commit | 081559cc5afb6c8f2f9847e1de739f66a5a07a6b (patch) | |
| tree | d777d2a54e0fb1654fe81e186b0168ddf4c1f857 /media/libnbaio | |
| parent | 0ba9f9b07d47e9e6b374798f397fe961256a6029 (diff) | |
| parent | 514ac2bae9fc32327cac3ba22c4862e8b5ef259e (diff) | |
| download | frameworks_av-081559cc5afb6c8f2f9847e1de739f66a5a07a6b.zip frameworks_av-081559cc5afb6c8f2f9847e1de739f66a5a07a6b.tar.gz frameworks_av-081559cc5afb6c8f2f9847e1de739f66a5a07a6b.tar.bz2 | |
am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing"
* commit '514ac2bae9fc32327cac3ba22c4862e8b5ef259e':
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 |