You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/08/10 17:58:15 UTC
[4/4] mesos git commit: Removed unneeded extra space in libprocess
code base.
Removed unneeded extra space in libprocess code base.
This patch is part of MESOS-5830, specially working on cleaning up
unneeded space in project libprocess.
Review: https://reviews.apache.org/r/50900/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0d3793e9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0d3793e9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0d3793e9
Branch: refs/heads/master
Commit: 0d3793e94adcd6dc91d06404f205639cebd753fd
Parents: a57e5a4
Author: Gaojin CAO <ca...@cmss.chinamobile.com>
Authored: Wed Aug 10 18:41:14 2016 +0100
Committer: Michael Park <mp...@apache.org>
Committed: Wed Aug 10 18:49:21 2016 +0100
----------------------------------------------------------------------
3rdparty/libprocess/include/process/async.hpp | 48 ++++++++++----------
.../libprocess/include/process/protobuf.hpp | 6 +--
3rdparty/libprocess/include/process/reap.hpp | 2 +-
.../libprocess/include/process/sequence.hpp | 8 ++--
.../libprocess/include/process/statistics.hpp | 2 +-
3rdparty/libprocess/src/reap.cpp | 10 ++--
3rdparty/libprocess/src/tests/benchmarks.cpp | 2 +-
3rdparty/libprocess/src/tests/http_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/metrics_tests.cpp | 2 +-
3rdparty/libprocess/src/tests/reap_tests.cpp | 6 +--
3rdparty/libprocess/src/tests/shared_tests.cpp | 2 +-
.../libprocess/src/tests/statistics_tests.cpp | 2 +-
12 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/include/process/async.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/async.hpp b/3rdparty/libprocess/include/process/async.hpp
index e7d8462..8565a52 100644
--- a/3rdparty/libprocess/include/process/async.hpp
+++ b/3rdparty/libprocess/include/process/async.hpp
@@ -36,13 +36,13 @@ namespace process {
template <typename F>
Future<typename result_of<F()>::type> async(
const F& f,
- typename boost::disable_if<boost::is_void<typename result_of<F()>::type> >::type* = nullptr); // NOLINT(whitespace/line_length)
+ typename boost::disable_if<boost::is_void<typename result_of<F()>::type>>::type* = nullptr); // NOLINT(whitespace/line_length)
template <typename F>
Future<Nothing> async(
const F& f,
- typename boost::enable_if<boost::is_void<typename result_of<F()>::type> >::type* = nullptr); // NOLINT(whitespace/line_length)
+ typename boost::enable_if<boost::is_void<typename result_of<F()>::type>>::type* = nullptr); // NOLINT(whitespace/line_length)
#define TEMPLATE(Z, N, DATA) \
@@ -50,14 +50,14 @@ Future<Nothing> async(
Future<typename result_of<F(ENUM_PARAMS(N, A))>::type> async( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type* = nullptr); /* NOLINT(whitespace/line_length) */ \
+ typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type* = nullptr); /* NOLINT(whitespace/line_length) */ \
\
\
template <typename F, ENUM_PARAMS(N, typename A)> \
Future<Nothing> async( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type* = nullptr); // NOLINT(whitespace/line_length)
+ typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type* = nullptr); // NOLINT(whitespace/line_length)
REPEAT_FROM_TO(1, 11, TEMPLATE, _) // Args A0 -> A9.
#undef TEMPLATE
@@ -79,7 +79,7 @@ private:
template <typename F>
typename result_of<F()>::type execute(
const F& f,
- typename boost::disable_if<boost::is_void<typename result_of<F()>::type> >::type* = nullptr) // NOLINT(whitespace/line_length)
+ typename boost::disable_if<boost::is_void<typename result_of<F()>::type>>::type* = nullptr) // NOLINT(whitespace/line_length)
{
terminate(self()); // Terminate process after function returns.
return f();
@@ -88,7 +88,7 @@ private:
template <typename F>
Nothing execute(
const F& f,
- typename boost::enable_if<boost::is_void<typename result_of<F()>::type> >::type* = nullptr) // NOLINT(whitespace/line_length)
+ typename boost::enable_if<boost::is_void<typename result_of<F()>::type>>::type* = nullptr) // NOLINT(whitespace/line_length)
{
terminate(self()); // Terminate process after function returns.
f();
@@ -100,7 +100,7 @@ private:
typename result_of<F(ENUM_PARAMS(N, A))>::type execute( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
+ typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
{ \
terminate(self()); /* Terminate process after function returns. */ \
return f(ENUM_PARAMS(N, a)); \
@@ -110,7 +110,7 @@ private:
Nothing execute( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
+ typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
{ \
terminate(self()); /* Terminate process after function returns. */ \
f(ENUM_PARAMS(N, a)); \
@@ -130,25 +130,25 @@ private:
template <typename F>
friend Future<typename result_of<F()>::type> async(
const F& f,
- typename boost::disable_if<boost::is_void<typename result_of<F()>::type> >::type*); // NOLINT(whitespace/line_length)
+ typename boost::disable_if<boost::is_void<typename result_of<F()>::type>>::type*); // NOLINT(whitespace/line_length)
template <typename F>
friend Future<Nothing> async(
const F& f,
- typename boost::enable_if<boost::is_void<typename result_of<F()>::type> >::type*); // NOLINT(whitespace/line_length)
+ typename boost::enable_if<boost::is_void<typename result_of<F()>::type>>::type*); // NOLINT(whitespace/line_length)
#define TEMPLATE(Z, N, DATA) \
template <typename F, ENUM_PARAMS(N, typename A)> \
friend Future<typename result_of<F(ENUM_PARAMS(N, A))>::type> async( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type*); /* NOLINT(whitespace/line_length) */ \
+ typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type*); /* NOLINT(whitespace/line_length) */ \
\
template <typename F, ENUM_PARAMS(N, typename A)> \
friend Future<Nothing> async( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type*); // NOLINT(whitespace/line_length)
+ typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type*); // NOLINT(whitespace/line_length)
REPEAT_FROM_TO(1, 11, TEMPLATE, _) // Args A0 -> A9.
#undef TEMPLATE
@@ -168,10 +168,10 @@ private:
template <typename F>
Future<typename result_of<F()>::type> execute(
const F& f,
- typename boost::disable_if<boost::is_void<typename result_of<F()>::type> >::type* = nullptr) // NOLINT(whitespace/line_length)
+ typename boost::disable_if<boost::is_void<typename result_of<F()>::type>>::type* = nullptr) // NOLINT(whitespace/line_length)
{
// Need to disambiguate overloaded method.
- typename result_of<F()>::type(AsyncExecutorProcess::*method)(const F&, typename boost::disable_if<boost::is_void<typename result_of<F()>::type> >::type*) = // NOLINT(whitespace/line_length)
+ typename result_of<F()>::type(AsyncExecutorProcess::*method)(const F&, typename boost::disable_if<boost::is_void<typename result_of<F()>::type>>::type*) = // NOLINT(whitespace/line_length)
&AsyncExecutorProcess::execute<F>;
return dispatch(process, method, f, (void*) nullptr);
@@ -180,10 +180,10 @@ private:
template <typename F>
Future<Nothing> execute(
const F& f,
- typename boost::enable_if<boost::is_void<typename result_of<F()>::type> >::type* = nullptr) // NOLINT(whitespace/line_length)
+ typename boost::enable_if<boost::is_void<typename result_of<F()>::type>>::type* = nullptr) // NOLINT(whitespace/line_length)
{
// Need to disambiguate overloaded method.
- Nothing(AsyncExecutorProcess::*method)(const F&, typename boost::enable_if<boost::is_void<typename result_of<F()>::type> >::type*) = // NOLINT(whitespace/line_length)
+ Nothing(AsyncExecutorProcess::*method)(const F&, typename boost::enable_if<boost::is_void<typename result_of<F()>::type>>::type*) = // NOLINT(whitespace/line_length)
&AsyncExecutorProcess::execute<F>;
return dispatch(process, method, f, (void*) nullptr);
@@ -194,10 +194,10 @@ private:
Future<typename result_of<F(ENUM_PARAMS(N, A))>::type> execute( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
+ typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
{ \
/* Need to disambiguate overloaded method. */ \
- typename result_of<F(ENUM_PARAMS(N, A))>::type(AsyncExecutorProcess::*method)(const F&, ENUM_PARAMS(N, A), typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type*) = /* NOLINT(whitespace/line_length) */ \
+ typename result_of<F(ENUM_PARAMS(N, A))>::type(AsyncExecutorProcess::*method)(const F&, ENUM_PARAMS(N, A), typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type*) = /* NOLINT(whitespace/line_length) */ \
&AsyncExecutorProcess::execute<F, ENUM_PARAMS(N, A)>; \
\
return dispatch(process, method, f, ENUM_PARAMS(N, a), (void*) nullptr); \
@@ -207,10 +207,10 @@ private:
Future<Nothing> execute( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
+ typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type* = nullptr) /* NOLINT(whitespace/line_length) */ \
{ \
/* Need to disambiguate overloaded method. */ \
- Nothing(AsyncExecutorProcess::*method)(const F&, ENUM_PARAMS(N, A), typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type*) = /* NOLINT(whitespace/line_length) */ \
+ Nothing(AsyncExecutorProcess::*method)(const F&, ENUM_PARAMS(N, A), typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type*) = /* NOLINT(whitespace/line_length) */ \
&AsyncExecutorProcess::execute<F, ENUM_PARAMS(N, A)>; \
\
return dispatch(process, method, f, ENUM_PARAMS(N, a), (void*) nullptr); \
@@ -227,7 +227,7 @@ private:
template <typename F>
Future<typename result_of<F()>::type> async(
const F& f,
- typename boost::disable_if<boost::is_void<typename result_of<F()>::type> >::type*) // NOLINT(whitespace/line_length)
+ typename boost::disable_if<boost::is_void<typename result_of<F()>::type>>::type*) // NOLINT(whitespace/line_length)
{
return AsyncExecutor().execute(f);
}
@@ -236,7 +236,7 @@ Future<typename result_of<F()>::type> async(
template <typename F>
Future<Nothing> async(
const F& f,
- typename boost::enable_if<boost::is_void<typename result_of<F()>::type> >::type*) // NOLINT(whitespace/line_length)
+ typename boost::enable_if<boost::is_void<typename result_of<F()>::type>>::type*) // NOLINT(whitespace/line_length)
{
return AsyncExecutor().execute(f);
}
@@ -247,7 +247,7 @@ Future<Nothing> async(
Future<typename result_of<F(ENUM_PARAMS(N, A))>::type> async( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type*) /* NOLINT(whitespace/line_length) */ \
+ typename boost::disable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type*) /* NOLINT(whitespace/line_length) */ \
{ \
return AsyncExecutor().execute(f, ENUM_PARAMS(N, a)); \
} \
@@ -256,7 +256,7 @@ Future<Nothing> async(
Future<Nothing> async( \
const F& f, \
ENUM_BINARY_PARAMS(N, A, a), \
- typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type> >::type*) /* NOLINT(whitespace/line_length) */ \
+ typename boost::enable_if<boost::is_void<typename result_of<F(ENUM_PARAMS(N, A))>::type>>::type*) /* NOLINT(whitespace/line_length) */ \
{ \
return AsyncExecutor().execute(f, ENUM_PARAMS(N, a)); \
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/include/process/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/protobuf.hpp b/3rdparty/libprocess/include/process/protobuf.hpp
index 7bee444..ad2f232 100644
--- a/3rdparty/libprocess/include/process/protobuf.hpp
+++ b/3rdparty/libprocess/include/process/protobuf.hpp
@@ -948,7 +948,7 @@ private:
// and waiting for a protobuf "response", but uses futures so that
// this can be done without needing to implement a process.
template <typename Req, typename Res>
-class ReqResProcess : public ProtobufProcess<ReqResProcess<Req, Res> >
+class ReqResProcess : public ProtobufProcess<ReqResProcess<Req, Res>>
{
public:
ReqResProcess(const process::UPID& _pid, const Req& _req)
@@ -956,7 +956,7 @@ public:
pid(_pid),
req(_req)
{
- ProtobufProcess<ReqResProcess<Req, Res> >::template
+ ProtobufProcess<ReqResProcess<Req, Res>>::template
install<Res>(&ReqResProcess<Req, Res>::response);
}
@@ -970,7 +970,7 @@ public:
{
promise.future().onDiscard(defer(this, &ReqResProcess::discarded));
- ProtobufProcess<ReqResProcess<Req, Res> >::send(pid, req);
+ ProtobufProcess<ReqResProcess<Req, Res>>::send(pid, req);
return promise.future();
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/include/process/reap.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/reap.hpp b/3rdparty/libprocess/include/process/reap.hpp
index 1a9709c..d7e0fa3 100644
--- a/3rdparty/libprocess/include/process/reap.hpp
+++ b/3rdparty/libprocess/include/process/reap.hpp
@@ -29,7 +29,7 @@ Duration MAX_REAP_INTERVAL();
// Otherwise, returns None once the process has been reaped elsewhere
// (or does not exist, which is indistinguishable from being reaped
// elsewhere). This will never discard the returned future.
-Future<Option<int> > reap(pid_t pid);
+Future<Option<int>> reap(pid_t pid);
} // namespace process {
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/include/process/sequence.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/sequence.hpp b/3rdparty/libprocess/include/process/sequence.hpp
index c9a46f2..b4d7593 100644
--- a/3rdparty/libprocess/include/process/sequence.hpp
+++ b/3rdparty/libprocess/include/process/sequence.hpp
@@ -72,11 +72,11 @@ public:
{
// This is the future that is used to notify the next callback
// (denoted by 'N' in the following graph).
- Owned<Promise<Nothing> > notifier(new Promise<Nothing>());
+ Owned<Promise<Nothing>> notifier(new Promise<Nothing>());
// This is the future that will be returned to the user (denoted
// by 'F' in the following graph).
- Owned<Promise<T> > promise(new Promise<T>());
+ Owned<Promise<T>> promise(new Promise<T>());
// We use a graph to show how we hook these futures. Each box in
// the graph represents a future. As mentioned above, 'F' denotes
@@ -141,7 +141,7 @@ protected:
private:
// Invoked when a callback is done.
- static void completed(Owned<Promise<Nothing> > notifier)
+ static void completed(Owned<Promise<Nothing>> notifier)
{
notifier->set(Nothing());
}
@@ -149,7 +149,7 @@ private:
// Invoked when a notifier is set.
template <typename T>
static void notified(
- Owned<Promise<T> > promise,
+ Owned<Promise<T>> promise,
const lambda::function<Future<T>()>& callback)
{
if (promise->future().hasDiscard()) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/include/process/statistics.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/statistics.hpp b/3rdparty/libprocess/include/process/statistics.hpp
index 13aa464..e9f1fc2 100644
--- a/3rdparty/libprocess/include/process/statistics.hpp
+++ b/3rdparty/libprocess/include/process/statistics.hpp
@@ -33,7 +33,7 @@ struct Statistics
// TimeSeries is empty.
// TODO(dhamon): Consider adding a histogram abstraction for better
// performance.
- static Option<Statistics<T> > from(const TimeSeries<T>& timeseries)
+ static Option<Statistics<T>> from(const TimeSeries<T>& timeseries)
{
std::vector<typename TimeSeries<T>::Value> values_ = timeseries.get();
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/src/reap.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/reap.cpp b/3rdparty/libprocess/src/reap.cpp
index f8d2fdc..5fc2a4d 100644
--- a/3rdparty/libprocess/src/reap.cpp
+++ b/3rdparty/libprocess/src/reap.cpp
@@ -66,11 +66,11 @@ class ReaperProcess : public Process<ReaperProcess>
public:
ReaperProcess() : ProcessBase(ID::generate("__reaper__")) {}
- Future<Option<int> > reap(pid_t pid)
+ Future<Option<int>> reap(pid_t pid)
{
// Check to see if this pid exists.
if (os::exists(pid)) {
- Owned<Promise<Option<int> > > promise(new Promise<Option<int> >());
+ Owned<Promise<Option<int>>> promise(new Promise<Option<int>>());
promises.put(pid, promise);
return promise->future();
} else {
@@ -110,7 +110,7 @@ protected:
void notify(pid_t pid, Result<int> status)
{
- foreach (const Owned<Promise<Option<int> > >& promise, promises.get(pid)) {
+ foreach (const Owned<Promise<Option<int>>>& promise, promises.get(pid)) {
if (status.isError()) {
promise->fail(status.error());
} else if (status.isNone()) {
@@ -141,7 +141,7 @@ private:
(MAX_REAP_INTERVAL() - MIN_REAP_INTERVAL()) * fraction);
}
- multihashmap<pid_t, Owned<Promise<Option<int> > > > promises;
+ multihashmap<pid_t, Owned<Promise<Option<int>>>> promises;
};
@@ -149,7 +149,7 @@ private:
static ReaperProcess* reaper = nullptr;
-Future<Option<int> > reap(pid_t pid)
+Future<Option<int>> reap(pid_t pid)
{
static Once* initialized = new Once();
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/src/tests/benchmarks.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/benchmarks.cpp b/3rdparty/libprocess/src/tests/benchmarks.cpp
index 9fac45e..945007c 100644
--- a/3rdparty/libprocess/src/tests/benchmarks.cpp
+++ b/3rdparty/libprocess/src/tests/benchmarks.cpp
@@ -148,7 +148,7 @@ private:
Future<Duration> _run()
{
- duration = Owned<Promise<Duration> >(new Promise<Duration>());
+ duration = Owned<Promise<Duration>>(new Promise<Duration>());
watch.start();
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/src/tests/http_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/http_tests.cpp b/3rdparty/libprocess/src/tests/http_tests.cpp
index 8a0d61e..24b266d 100644
--- a/3rdparty/libprocess/src/tests/http_tests.cpp
+++ b/3rdparty/libprocess/src/tests/http_tests.cpp
@@ -439,7 +439,7 @@ TEST(HTTPTest, PathParse)
{
const string pattern = "/books/{isbn}/chapters/{chapter}";
- Try<hashmap<string, string> > parse =
+ Try<hashmap<string, string>> parse =
http::path::parse(pattern, "/books/0304827484/chapters/3");
ASSERT_SOME(parse);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/metrics_tests.cpp b/3rdparty/libprocess/src/tests/metrics_tests.cpp
index 4ddd35b..88526e6 100644
--- a/3rdparty/libprocess/src/tests/metrics_tests.cpp
+++ b/3rdparty/libprocess/src/tests/metrics_tests.cpp
@@ -182,7 +182,7 @@ TEST_F(MetricsTest, Statistics)
++counter;
}
- Option<Statistics<double> > statistics = counter.statistics();
+ Option<Statistics<double>> statistics = counter.statistics();
EXPECT_SOME(statistics);
EXPECT_EQ(11u, statistics.get().count);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/src/tests/reap_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/reap_tests.cpp b/3rdparty/libprocess/src/tests/reap_tests.cpp
index 0cbe9f1..56dadcc 100644
--- a/3rdparty/libprocess/src/tests/reap_tests.cpp
+++ b/3rdparty/libprocess/src/tests/reap_tests.cpp
@@ -62,7 +62,7 @@ TEST(ReapTest, NonChildProcess)
pid_t grandchild = tree.get().children.front();
// Reap the grandchild process.
- Future<Option<int> > status = process::reap(grandchild);
+ Future<Option<int>> status = process::reap(grandchild);
EXPECT_TRUE(status.isPending());
@@ -118,7 +118,7 @@ TEST(ReapTest, ChildProcess)
pid_t child = tree.get();
// Reap the child process.
- Future<Option<int> > status = process::reap(child);
+ Future<Option<int>> status = process::reap(child);
// Now kill the child.
EXPECT_EQ(0, kill(child, SIGKILL));
@@ -171,7 +171,7 @@ TEST(ReapTest, TerminatedChildProcess)
}
// Now that it's terminated, attempt to reap it.
- Future<Option<int> > status = process::reap(child);
+ Future<Option<int>> status = process::reap(child);
// Advance time until the reaper sends the notification.
Clock::pause();
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/src/tests/shared_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/shared_tests.cpp b/3rdparty/libprocess/src/tests/shared_tests.cpp
index 8f94cca..2a2ffe7 100644
--- a/3rdparty/libprocess/src/tests/shared_tests.cpp
+++ b/3rdparty/libprocess/src/tests/shared_tests.cpp
@@ -90,7 +90,7 @@ TEST(SharedTest, Own)
EXPECT_EQ(42, shared.get()->get());
EXPECT_TRUE(shared.unique());
- Future<Owned<Foo> > future;
+ Future<Owned<Foo>> future;
{
Shared<Foo> shared2(shared);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d3793e9/3rdparty/libprocess/src/tests/statistics_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/statistics_tests.cpp b/3rdparty/libprocess/src/tests/statistics_tests.cpp
index db9817f..54849a0 100644
--- a/3rdparty/libprocess/src/tests/statistics_tests.cpp
+++ b/3rdparty/libprocess/src/tests/statistics_tests.cpp
@@ -53,7 +53,7 @@ TEST(StatisticsTest, Statistics)
timeseries.set(i, now);
}
- Option<Statistics<double> > statistics = Statistics<double>::from(timeseries);
+ Option<Statistics<double>> statistics = Statistics<double>::from(timeseries);
EXPECT_SOME(statistics);