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 2014/02/20 08:47:49 UTC
[4/5] git commit: Moved ExecutorProcess into 'internal' namespace.
Moved ExecutorProcess into 'internal' namespace.
Review: https://reviews.apache.org/r/18205
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a559830d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a559830d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a559830d
Branch: refs/heads/master
Commit: a559830d5b58a7d089eb03b18bb0cc98a2fbc5c2
Parents: 24a3136
Author: Benjamin Hindman <be...@gmail.com>
Authored: Mon Feb 17 10:44:02 2014 -0800
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Wed Feb 19 23:45:52 2014 -0800
----------------------------------------------------------------------
3rdparty/libprocess/include/process/executor.hpp | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a559830d/3rdparty/libprocess/include/process/executor.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/executor.hpp b/3rdparty/libprocess/include/process/executor.hpp
index 4ce0a21..e28790e 100644
--- a/3rdparty/libprocess/include/process/executor.hpp
+++ b/3rdparty/libprocess/include/process/executor.hpp
@@ -13,12 +13,14 @@
namespace process {
+namespace internal {
+
// Underlying "process" which handles invoking actual callbacks
// created through an Executor.
class ExecutorProcess : public Process<ExecutorProcess>
{
private:
- friend class Executor;
+ friend class process::Executor;
ExecutorProcess() : ProcessBase(ID::generate("__executor__")) {}
virtual ~ExecutorProcess() {}
@@ -44,6 +46,8 @@ private:
#undef TEMPLATE
};
+} // namespace internal {
+
// Provides an abstraction that can take a standard function object
// and convert it to a 'Deferred'. Each converted function object will
@@ -222,30 +226,30 @@ private:
Executor& operator = (const Executor&);
static void dispatcher(
- const PID<ExecutorProcess>& pid,
+ const PID<internal::ExecutorProcess>& pid,
const std::tr1::function<void(void)>& f)
{
// TODO(benh): Why not just use internal::dispatch?
- dispatch(pid, &ExecutorProcess::invoke, f);
+ dispatch(pid, &internal::ExecutorProcess::invoke, f);
}
#define TEMPLATE(Z, N, DATA) \
template <ENUM_PARAMS(N, typename A)> \
static void CAT(dispatcher, N)( \
- const PID<ExecutorProcess>& pid, \
+ const PID<internal::ExecutorProcess>& pid, \
const std::tr1::function<void(ENUM_PARAMS(N, A))>& f, \
ENUM_BINARY_PARAMS(N, A, a)) \
{ \
dispatch( \
pid, \
- &ExecutorProcess::CAT(invoke, N)<ENUM_PARAMS(N, A)>, \
+ &internal::ExecutorProcess::CAT(invoke, N)<ENUM_PARAMS(N, A)>, \
f, ENUM_PARAMS(N, a)); \
}
REPEAT_FROM_TO(1, 11, TEMPLATE, _) // Args A0 -> A9.
#undef TEMPLATE
- ExecutorProcess process;
+ internal::ExecutorProcess process;
};