Fixed a 32 bit compilation issue in files.cpp. The call to min(ssize_t, long int) won't compile on 32 bit systems because ssize_t resolves to int on those systems.
From: Kevin Lyda <ke...@ie.suberic.net> Review: https://reviews.apache.org/r/13793 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/56a54f53 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/56a54f53 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/56a54f53 Branch: refs/heads/master Commit: 56a54f536b2d6b2b2bd80fdfd665d1cd5980a9c1 Parents: 6f24656 Author: Benjamin Mahler <bmah...@twitter.com> Authored: Mon Aug 26 18:20:27 2013 -0700 Committer: Benjamin Mahler <bmah...@twitter.com> Committed: Mon Aug 26 18:20:27 2013 -0700 ---------------------------------------------------------------------- src/files/files.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/56a54f53/src/files/files.cpp ---------------------------------------------------------------------- diff --git a/src/files/files.cpp b/src/files/files.cpp index c609505..69d6852 100644 --- a/src/files/files.cpp +++ b/src/files/files.cpp @@ -272,7 +272,7 @@ Future<Response> FilesProcess::read(const Request& request) } // Cap the read length at 16 pages. - length = std::min(length, sysconf(_SC_PAGE_SIZE) * 16); + length = std::min<ssize_t>(length, sysconf(_SC_PAGE_SIZE) * 16); if (offset >= size) { os::close(fd.get());
