You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/07/07 15:32:40 UTC
[1/2] mesos git commit: Fix compilation error for clang-3.5 type
deduction error.
Repository: mesos
Updated Branches:
refs/heads/master 5ff52b6b8 -> 8d4b1d504
Fix compilation error for clang-3.5 type deduction error.
While we figure out how to avoid this bug in clang-3.5, we can allow
people to compile by explicitly specifying the return type of the
lambda.
Review: https://reviews.apache.org/r/36245
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8d4b1d50
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8d4b1d50
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8d4b1d50
Branch: refs/heads/master
Commit: 8d4b1d50412993ff63970c493154ae13ebfb6fda
Parents: 35ddcf0
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Tue Jul 7 06:29:09 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jul 7 06:32:12 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/libevent_ssl_socket.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8d4b1d50/3rdparty/libprocess/src/libevent_ssl_socket.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/libevent_ssl_socket.cpp b/3rdparty/libprocess/src/libevent_ssl_socket.cpp
index ab05fea..1ef925c 100644
--- a/3rdparty/libprocess/src/libevent_ssl_socket.cpp
+++ b/3rdparty/libprocess/src/libevent_ssl_socket.cpp
@@ -783,7 +783,9 @@ Try<Nothing> LibeventSSLSocketImpl::listen(int backlog)
Future<Socket> LibeventSSLSocketImpl::accept()
{
return accept_queue.get()
- .then([](const Future<Socket>& future) { return future; });
+ .then([](const Future<Socket>& future) -> Future<Socket> {
+ return future;
+ });
}
[2/2] mesos git commit: Explicitly inform the compiler of a function
pointer.
Posted by be...@apache.org.
Explicitly inform the compiler of a function pointer.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/35ddcf06
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/35ddcf06
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/35ddcf06
Branch: refs/heads/master
Commit: 35ddcf066c8aef3fac8b2678258152a92b167176
Parents: 5ff52b6
Author: Benjamin Hindman <be...@gmail.com>
Authored: Tue Jul 7 06:29:02 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Tue Jul 7 06:32:12 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/35ddcf06/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
index 4a01d94..d7d4552 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
@@ -537,10 +537,10 @@ void dosetsid(void)
TEST_F(OsTest, Killtree)
{
Try<ProcessTree> tree =
- Fork(dosetsid, // Child.
+ Fork(&dosetsid, // Child.
Fork(None(), // Grandchild.
Fork(None(), // Great-grandchild.
- Fork(dosetsid, // Great-great-granchild.
+ Fork(&dosetsid, // Great-great-granchild.
Exec("sleep 10")),
Exec("sleep 10")),
Exec("exit 0")),
@@ -660,7 +660,7 @@ TEST_F(OsTest, Killtree)
TEST_F(OsTest, KilltreeNoRoot)
{
Try<ProcessTree> tree =
- Fork(dosetsid, // Child.
+ Fork(&dosetsid, // Child.
Fork(None(), // Grandchild.
Fork(None(),
Exec("sleep 100")),