You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dm...@apache.org on 2014/12/19 22:06:25 UTC
mesos git commit: Fixed a compilation issue in GCC 4.6.
Repository: mesos
Updated Branches:
refs/heads/master 0b5693635 -> c51312665
Fixed a compilation issue in GCC 4.6.
Review: https://reviews.apache.org/r/29180
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c5131266
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c5131266
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c5131266
Branch: refs/heads/master
Commit: c51312665029554b49b7401f511a24ddd63bcd41
Parents: 0b56936
Author: Michael Park <mc...@gmail.com>
Authored: Fri Dec 19 13:03:51 2014 -0800
Committer: Dominic Hamon <dh...@twitter.com>
Committed: Fri Dec 19 13:04:15 2014 -0800
----------------------------------------------------------------------
3rdparty/libprocess/include/process/clock.hpp | 3 ++-
3rdparty/libprocess/src/clock.cpp | 6 +++---
3rdparty/libprocess/src/process.cpp | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c5131266/3rdparty/libprocess/include/process/clock.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/clock.hpp b/3rdparty/libprocess/include/process/clock.hpp
index 1fd418b..f97cde7 100644
--- a/3rdparty/libprocess/include/process/clock.hpp
+++ b/3rdparty/libprocess/include/process/clock.hpp
@@ -28,7 +28,8 @@ public:
// TODO(benh): Introduce a "channel" or listener pattern for getting
// the expired Timers rather than passing in a callback. This might
// mean we don't need 'initialize' or 'shutdown'.
- static void initialize(lambda::function<void(std::list<Timer>&&)>&& callback);
+ static void initialize(
+ lambda::function<void(const std::list<Timer>&)>&& callback);
static Time now();
static Time now(ProcessBase* process);
http://git-wip-us.apache.org/repos/asf/mesos/blob/c5131266/3rdparty/libprocess/src/clock.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/clock.cpp b/3rdparty/libprocess/src/clock.cpp
index dfe9ced..2bc7fa9 100644
--- a/3rdparty/libprocess/src/clock.cpp
+++ b/3rdparty/libprocess/src/clock.cpp
@@ -67,7 +67,7 @@ bool paused = false;
bool settling = false;
// Lambda function to invoke when timers have expired.
-lambda::function<void(list<Timer>&&)> callback;
+lambda::function<void(const list<Timer>&)> callback;
} // namespace clock {
@@ -164,7 +164,7 @@ void handle_timeouts(struct ev_loop* loop, ev_timer* _, int revents)
update_timer = false; // Since we might have a queued update_timer.
}
- clock::callback(std::move(timers));
+ clock::callback(timers);
// Mark 'settling' as false since there are not any more timeouts
// that will expire before the paused time and we've finished
@@ -180,7 +180,7 @@ void handle_timeouts(struct ev_loop* loop, ev_timer* _, int revents)
}
-void Clock::initialize(lambda::function<void(list<Timer>&&)>&& callback)
+void Clock::initialize(lambda::function<void(const list<Timer>&)>&& callback)
{
// TODO(benh): Currently this function is expected to get called
// just after initializing libev in process::initialize. But that is
http://git-wip-us.apache.org/repos/asf/mesos/blob/c5131266/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 028b33e..fdba949 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -685,7 +685,7 @@ void* schedule(void* arg)
}
-void timedout(list<Timer>&& timers)
+void timedout(const list<Timer>& timers)
{
// Update current time of process (if it's present/valid). Note that
// current time may be greater than the timeout if a local message