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:26 UTC
[12/16] mesos git commit: Removed an unnecessary function declaration
from slave.hpp.
Removed an unnecessary function declaration from slave.hpp.
Review: https://reviews.apache.org/r/59668
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/10ab6c22
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/10ab6c22
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/10ab6c22
Branch: refs/heads/master
Commit: 10ab6c225cab7f6bbe8890e06fb8aafde662bc92
Parents: 6254e2d
Author: Jie Yu <yu...@gmail.com>
Authored: Tue May 30 16:02:14 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed May 31 14:51:10 2017 -0700
----------------------------------------------------------------------
src/slave/slave.cpp | 10 +++++++++-
src/slave/slave.hpp | 6 ------
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/10ab6c22/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 052a7f7..89078ad 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -161,6 +161,14 @@ namespace slave {
using namespace state;
+// Forward declarations.
+
+// Needed for logging task/task group.
+static string taskOrTaskGroup(
+ const Option<TaskInfo>& task,
+ const Option<TaskGroupInfo>& taskGroup);
+
+
Slave::Slave(const string& id,
const slave::Flags& _flags,
MasterDetector* _detector,
@@ -7861,7 +7869,7 @@ std::ostream& operator<<(std::ostream& stream, Slave::State state)
}
-string taskOrTaskGroup(
+static string taskOrTaskGroup(
const Option<TaskInfo>& task,
const Option<TaskGroupInfo>& taskGroup)
{
http://git-wip-us.apache.org/repos/asf/mesos/blob/10ab6c22/src/slave/slave.hpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp
index afa3a12..09b7f0a 100644
--- a/src/slave/slave.hpp
+++ b/src/slave/slave.hpp
@@ -951,12 +951,6 @@ std::ostream& operator<<(std::ostream& stream, Executor::State state);
std::ostream& operator<<(std::ostream& stream, Framework::State state);
std::ostream& operator<<(std::ostream& stream, Slave::State state);
-
-// Needed for logging task/task group.
-std::string taskOrTaskGroup(
- const Option<TaskInfo>& task,
- const Option<TaskGroupInfo>& taskGroup);
-
} // namespace slave {
} // namespace internal {
} // namespace mesos {