You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/03/05 00:06:31 UTC
[2/2] git commit: Updates to mesos for Future::get() returning a
const reference.
Updates to mesos for Future::get() returning a const reference.
Review: https://reviews.apache.org/r/18445
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5db3fea1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5db3fea1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5db3fea1
Branch: refs/heads/master
Commit: 5db3fea1649d1d9b67b303dc0dce8393528e8e02
Parents: 6f066e7
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Tue Mar 4 14:28:11 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Mar 4 14:45:38 2014 -0800
----------------------------------------------------------------------
src/log/log.cpp | 3 ++-
src/tests/log_tests.cpp | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5db3fea1/src/log/log.cpp
----------------------------------------------------------------------
diff --git a/src/log/log.cpp b/src/log/log.cpp
index 7f855f2..2d3a0cf 100644
--- a/src/log/log.cpp
+++ b/src/log/log.cpp
@@ -333,7 +333,8 @@ void LogProcess::_recover()
}
promises.clear();
} else {
- replica = future.get().share();
+ Owned<Replica> replica_ = future.get();
+ replica = replica_.share();
// Mark the success of the recovery.
recovered.set(Nothing());
http://git-wip-us.apache.org/repos/asf/mesos/blob/5db3fea1/src/tests/log_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/log_tests.cpp b/src/tests/log_tests.cpp
index 0e2485f..7f2a740 100644
--- a/src/tests/log_tests.cpp
+++ b/src/tests/log_tests.cpp
@@ -1536,7 +1536,8 @@ TEST_F(RecoverTest, RacingCatchup)
AWAIT_READY(recovering4);
AWAIT_READY(recovering5);
- Shared<Replica> shared4 = recovering4.get().share();
+ Owned<Replica> shared4_ = recovering4.get();
+ Shared<Replica> shared4 = shared4_.share();
Coordinator coord2(3, shared4, network2);
{