[3/5] mesos git commit: mesos: Fixed template style
's/template
Posted by mp...@apache.org.
mesos: Fixed template style 's/template</template </'.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c96d9ebc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c96d9ebc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c96d9ebc
Branch: refs/heads/master
Commit: c96d9ebc1962ad7a35f68f407b022d8cba99d616
Parents: 3874af0
Author: Michael Park <mp...@apache.org>
Authored: Wed Sep 9 18:07:57 2015 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Wed Sep 9 18:07:57 2015 -0700
----------------------------------------------------------------------
src/common/parse.hpp | 2 +-
src/jvm/jvm.cpp | 4 ++--
src/slave/containerizer/external_containerizer.cpp | 2 +-
src/tests/mesos.hpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c96d9ebc/src/common/parse.hpp
----------------------------------------------------------------------
diff --git a/src/common/parse.hpp b/src/common/parse.hpp
index 77aeefb..6a2ebe4 100644
--- a/src/common/parse.hpp
+++ b/src/common/parse.hpp
@@ -91,7 +91,7 @@ inline Try<mesos::ContainerInfo> parse(const std::string& value)
// When the same variable is listed multiple times,
// uses only the last value.
-template<>
+template <>
inline Try<hashmap<std::string, std::string>> parse(const std::string& value)
{
// Convert from string or file to JSON.
http://git-wip-us.apache.org/repos/asf/mesos/blob/c96d9ebc/src/jvm/jvm.cpp
----------------------------------------------------------------------
diff --git a/src/jvm/jvm.cpp b/src/jvm/jvm.cpp
index 3fda5a7..b3fac58 100644
--- a/src/jvm/jvm.cpp
+++ b/src/jvm/jvm.cpp
@@ -607,7 +607,7 @@ jmethodID Jvm::findMethod(
}
-template<>
+template <>
void Jvm::invokeV<void>(
const jobject receiver,
const jmethodID id,
@@ -723,7 +723,7 @@ double Jvm::invokeV<double>(
}
-template<>
+template <>
void Jvm::invokeStaticV<void>(
const Class& receiver,
const jmethodID id,
http://git-wip-us.apache.org/repos/asf/mesos/blob/c96d9ebc/src/slave/containerizer/external_containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/external_containerizer.cpp b/src/slave/containerizer/external_containerizer.cpp
index d3640e7..2116492 100644
--- a/src/slave/containerizer/external_containerizer.cpp
+++ b/src/slave/containerizer/external_containerizer.cpp
@@ -105,7 +105,7 @@ static Option<Error> validate(
// Validate the invocation results and extract a piped protobuf
// message.
-template<typename T>
+template <typename T>
static Try<T> result(
const Future<tuple<Future<Result<T>>, Future<Option<int>>>>& future)
{
http://git-wip-us.apache.org/repos/asf/mesos/blob/c96d9ebc/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 906948d..6b50311 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -276,7 +276,7 @@ private:
hashset<std::string> subsystems;
};
#else
-template<>
+template <>
class ContainerizerTest<slave::MesosContainerizer> : public MesosTest
{
protected:
[2/5] mesos git commit: libprocess: Fixed template style
's/template
Posted by mp...@apache.org.
libprocess: Fixed template style 's/template</template </'.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3874af09
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3874af09
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3874af09
Branch: refs/heads/master
Commit: 3874af09c397752914aed92487d1b87b4f7170c9
Parents: e63338e
Author: Michael Park <mp...@apache.org>
Authored: Wed Sep 9 18:07:47 2015 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Wed Sep 9 18:07:47 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/include/process/metrics/timer.hpp | 4 ++--
3rdparty/libprocess/include/process/process.hpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3874af09/3rdparty/libprocess/include/process/metrics/timer.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/metrics/timer.hpp b/3rdparty/libprocess/include/process/metrics/timer.hpp
index 76890b7..08f16b8 100644
--- a/3rdparty/libprocess/include/process/metrics/timer.hpp
+++ b/3rdparty/libprocess/include/process/metrics/timer.hpp
@@ -35,7 +35,7 @@ namespace metrics {
// A Metric that represents a timed event. It is templated on a Duration
// subclass that specifies the unit to use for the Timer.
-template<class T>
+template <class T>
class Timer : public Metric
{
public:
@@ -90,7 +90,7 @@ public:
}
// Time an asynchronous event.
- template<typename U>
+ template <typename U>
Future<U> time(const Future<U>& future)
{
// We need to take a copy of 'this' here to ensure that the
http://git-wip-us.apache.org/repos/asf/mesos/blob/3874af09/3rdparty/libprocess/include/process/process.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/process.hpp b/3rdparty/libprocess/include/process/process.hpp
index 009f7c4..cc8317f 100644
--- a/3rdparty/libprocess/include/process/process.hpp
+++ b/3rdparty/libprocess/include/process/process.hpp
@@ -267,7 +267,7 @@ protected:
* Returns the number of events of the given type currently on the event
* queue.
*/
- template<typename T>
+ template <typename T>
size_t eventCount()
{
size_t count = 0U;
@@ -296,7 +296,7 @@ private:
TERMINATED
} state;
- template<typename T>
+ template <typename T>
static bool isEventType(const Event* event)
{
return event->is<T>();
[5/5] mesos git commit: Removed the 70 column restriction on comments
from the style guide.
Posted by mp...@apache.org.
Removed the 70 column restriction on comments from the style guide.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f9c2604e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f9c2604e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f9c2604e
Branch: refs/heads/master
Commit: f9c2604ea97b91f8a9ec3b2863317761679b1c86
Parents: 0dc74bb
Author: Michael Park <mp...@apache.org>
Authored: Wed Sep 9 18:14:46 2015 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Wed Sep 9 18:17:50 2015 -0700
----------------------------------------------------------------------
docs/mesos-c++-style-guide.md | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f9c2604e/docs/mesos-c++-style-guide.md
----------------------------------------------------------------------
diff --git a/docs/mesos-c++-style-guide.md b/docs/mesos-c++-style-guide.md
index 8793179..5e4d13e 100644
--- a/docs/mesos-c++-style-guide.md
+++ b/docs/mesos-c++-style-guide.md
@@ -46,7 +46,6 @@ void Slave::statusUpdate(StatusUpdate update, const UPID& pid)
## Comments
* End each sentence within a comment with a punctuation mark (please note that we generally prefer periods); this applies to incomplete sentences as well.
-* At most 70 characters per line in comments.
* For trailing comments, leave one space.
## Breaks
[4/5] mesos git commit: Fixed break before braces style for 'enum'.
Posted by mp...@apache.org.
Fixed break before braces style for 'enum'.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0dc74bbf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0dc74bbf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0dc74bbf
Branch: refs/heads/master
Commit: 0dc74bbfbc38058786f5a77d531c70b512d1a6ef
Parents: c96d9eb
Author: Michael Park <mp...@apache.org>
Authored: Wed Sep 9 18:17:35 2015 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Wed Sep 9 18:17:50 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/io.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0dc74bbf/3rdparty/libprocess/src/io.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/io.cpp b/3rdparty/libprocess/src/io.cpp
index e5fca24..88c37ba 100644
--- a/3rdparty/libprocess/src/io.cpp
+++ b/3rdparty/libprocess/src/io.cpp
@@ -32,7 +32,8 @@ namespace process {
namespace io {
namespace internal {
-enum ReadFlags {
+enum ReadFlags
+{
NONE = 0,
PEEK
};