You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/05/31 21:51:28 UTC
[14/16] mesos git commit: Removed some unnecessary std:: prefix in
slave.cpp.
Removed some unnecessary std:: prefix in slave.cpp.
Review: https://reviews.apache.org/r/59669
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/97272c80
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/97272c80
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/97272c80
Branch: refs/heads/master
Commit: 97272c80c3586bea568974161223d1c4ec381e36
Parents: 10ab6c2
Author: Jie Yu <yu...@gmail.com>
Authored: Tue May 30 16:03:57 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed May 31 14:51:10 2017 -0700
----------------------------------------------------------------------
src/slave/slave.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/97272c80/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 89078ad..c3df7d9 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -128,8 +128,10 @@ using mesos::slave::ResourceEstimator;
using std::find;
using std::list;
using std::map;
+using std::ostream;
using std::ostringstream;
using std::set;
+using std::shared_ptr;
using std::string;
using std::vector;
@@ -1493,7 +1495,7 @@ void Slave::doReliableRegistration(Duration maxBackoff)
completedFramework_->add_tasks()->CopyFrom(*task);
}
- foreach (const std::shared_ptr<Task>& task, executor->completedTasks) {
+ foreach (const shared_ptr<Task>& task, executor->completedTasks) {
VLOG(2) << "Reregistering completed task " << task->task_id();
completedFramework_->add_tasks()->CopyFrom(*task);
}
@@ -2953,7 +2955,7 @@ void Slave::killTask(
// send a TASK_KILLED update for all tasks in the group.
Option<TaskGroupInfo> taskGroup = executor->getQueuedTaskGroup(taskId);
- std::list<StatusUpdate> updates;
+ list<StatusUpdate> updates;
if (taskGroup.isSome()) {
foreach (const TaskInfo& task, taskGroup->tasks()) {
updates.push_back(protobuf::createStatusUpdate(
@@ -3010,7 +3012,7 @@ void Slave::killTask(
// send a TASK_KILLED update for all the other tasks.
Option<TaskGroupInfo> taskGroup = executor->getQueuedTaskGroup(taskId);
- std::list<StatusUpdate> updates;
+ list<StatusUpdate> updates;
if (taskGroup.isSome()) {
foreach (const TaskInfo& task, taskGroup->tasks()) {
updates.push_back(protobuf::createStatusUpdate(
@@ -7417,7 +7419,7 @@ void Executor::completeTask(const TaskID& taskId)
<< "Failed to find terminated task " << taskId;
Task* task = terminatedTasks[taskId];
- completedTasks.push_back(std::shared_ptr<Task>(task));
+ completedTasks.push_back(shared_ptr<Task>(task));
terminatedTasks.erase(taskId);
}
@@ -7818,7 +7820,7 @@ CommandInfo defaultExecutorCommandInfo(
}
-std::ostream& operator<<(std::ostream& stream, const Executor& executor)
+ostream& operator<<(ostream& stream, const Executor& executor)
{
stream << "'" << executor.id << "' of framework " << executor.frameworkId;
@@ -7835,7 +7837,7 @@ std::ostream& operator<<(std::ostream& stream, const Executor& executor)
}
-std::ostream& operator<<(std::ostream& stream, Executor::State state)
+ostream& operator<<(ostream& stream, Executor::State state)
{
switch (state) {
case Executor::REGISTERING: return stream << "REGISTERING";
@@ -7847,7 +7849,7 @@ std::ostream& operator<<(std::ostream& stream, Executor::State state)
}
-std::ostream& operator<<(std::ostream& stream, Framework::State state)
+ostream& operator<<(ostream& stream, Framework::State state)
{
switch (state) {
case Framework::RUNNING: return stream << "RUNNING";
@@ -7857,7 +7859,7 @@ std::ostream& operator<<(std::ostream& stream, Framework::State state)
}
-std::ostream& operator<<(std::ostream& stream, Slave::State state)
+ostream& operator<<(ostream& stream, Slave::State state)
{
switch (state) {
case Slave::RECOVERING: return stream << "RECOVERING";