summaryrefslogtreecommitdiffstats
path: root/media/libnbaio
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-01-11 04:20:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-01-11 04:20:11 +0000
commite311b15cf821f65f68af2cdfe01e864cbc9a86ce (patch)
tree442e530b17dc541fbff5b00427859f5c50bccd16 /media/libnbaio
parent61540b5fe82cad1c6baa018f02bd2554e62e4364 (diff)
parent3b546caeb0a576c4d7d7f1e8d2fdfed2bb8bdeed (diff)
downloadframeworks_av-e311b15cf821f65f68af2cdfe01e864cbc9a86ce.zip
frameworks_av-e311b15cf821f65f68af2cdfe01e864cbc9a86ce.tar.gz
frameworks_av-e311b15cf821f65f68af2cdfe01e864cbc9a86ce.tar.bz2
Merge "Fix c++11 narrowing"
Diffstat (limited to 'media/libnbaio')
-rw-r--r--media/libnbaio/MonoPipe.cpp2
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