You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/02/27 19:28:57 UTC
[1/3] git commit: Patched glog to compile demangle.cc with clang.
Repository: mesos
Updated Branches:
refs/heads/master c053d7924 -> 162a7f5d8
Patched glog to compile demangle.cc with clang.
Review: https://reviews.apache.org/r/18307
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/33aad708
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/33aad708
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/33aad708
Branch: refs/heads/master
Commit: 33aad7088e21125a5782bffaf1a8c7ca570a04d8
Parents: c053d79
Author: Bernd Mathiske <be...@mesosphere.io>
Authored: Thu Feb 27 10:11:25 2014 -0800
Committer: Vinod Kone <vi...@twitter.com>
Committed: Thu Feb 27 10:11:25 2014 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/glog-0.3.3.patch | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/33aad708/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/glog-0.3.3.patch b/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
index 974f9f5..76b8c0f 100644
--- a/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
+++ b/3rdparty/libprocess/3rdparty/glog-0.3.3.patch
@@ -116,3 +116,25 @@ index 5dcbc44..ee344ca 100644
{
// Test a hashed simple associative container.
// Use a user defined hash function.
+diff --git a/src/demangle.cc b/src/demangle.cc
+index 0daf308..1136e0d 100644
+--- a/src/demangle.cc
++++ b/src/demangle.cc
+@@ -167,7 +167,7 @@ static size_t StrLen(const char *str) {
+ // Returns true if "str" has at least "n" characters remaining.
+ static bool AtLeastNumCharsRemaining(const char *str, int n) {
+ for (int i = 0; i < n; ++i) {
+- if (str == '\0') {
++ if (str[i] == '\0') {
+ return false;
+ }
+ }
+@@ -223,7 +223,7 @@ static bool ParseTwoCharToken(State *state, const char *two_char_token) {
+ // Returns true and advances "mangled_cur" if we find any character in
+ // "char_class" at "mangled_cur" position.
+ static bool ParseCharClass(State *state, const char *char_class) {
+- if (state->mangled_cur == '\0') {
++ if (state->mangled_cur[0] == '\0') {
+ return false;
+ }
+ const char *p = char_class;
[2/3] git commit: Fixed compile errors in lib stout when using Clang
3.5 on Ubuntu 13.10.
Posted by vi...@apache.org.
Fixed compile errors in lib stout when using Clang 3.5 on Ubuntu
13.10.
Review: https://reviews.apache.org/r/18425
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/66155da3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/66155da3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/66155da3
Branch: refs/heads/master
Commit: 66155da331d54710121e92db45358ea91aaac15d
Parents: 33aad70
Author: Bernd Mathiske <be...@mesosphere.io>
Authored: Thu Feb 27 10:16:23 2014 -0800
Committer: Vinod Kone <vi...@twitter.com>
Committed: Thu Feb 27 10:16:23 2014 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp | 4 ++--
3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/66155da3/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
index 3eadaef..d6b070f 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp
@@ -46,7 +46,7 @@ namespace strings {
namespace internal {
Try<std::string> format(const std::string& fmt, va_list args);
-Try<std::string> format(const std::string& fmt, ...);
+Try<std::string> format(const std::string fmt, ...);
template <typename T, bool b>
struct stringify;
@@ -396,7 +396,7 @@ inline Try<std::string> format(const std::string& fmt, va_list args)
}
-inline Try<std::string> format(const std::string& fmt, ...)
+inline Try<std::string> format(const std::string fmt, ...)
{
va_list args;
va_start(args, fmt);
http://git-wip-us.apache.org/repos/asf/mesos/blob/66155da3/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
index bba6f43..20d028f 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
@@ -724,7 +724,7 @@ inline Try<std::string> hostname()
// Runs a shell command formatted with varargs and return the return value
// of the command. Optionally, the output is returned via an argument.
// TODO(vinod): Pass an istream object that can provide input to the command.
-inline Try<int> shell(std::ostream* os, const std::string& fmt, ...)
+inline Try<int> shell(std::ostream* os, const std::string fmt, ...)
{
va_list args;
va_start(args, fmt);
[3/3] git commit: Fixed compile errors in mesos with Clang 3.5 on
Ubuntu 13.10.
Posted by vi...@apache.org.
Fixed compile errors in mesos with Clang 3.5 on Ubuntu 13.10.
Review: https://reviews.apache.org/r/18426
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/162a7f5d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/162a7f5d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/162a7f5d
Branch: refs/heads/master
Commit: 162a7f5d84b3cc04e5f3a612e62bf76f1c1c25a4
Parents: 66155da
Author: Bernd Mathiske <be...@mesosphere.io>
Authored: Thu Feb 27 10:18:16 2014 -0800
Committer: Vinod Kone <vi...@twitter.com>
Committed: Thu Feb 27 10:18:16 2014 -0800
----------------------------------------------------------------------
src/jvm/jvm.cpp | 6 +++---
src/jvm/jvm.hpp | 14 +++++++-------
src/messages/state.hpp | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/162a7f5d/src/jvm/jvm.cpp
----------------------------------------------------------------------
diff --git a/src/jvm/jvm.cpp b/src/jvm/jvm.cpp
index 6eb3a34..d3dfa75 100644
--- a/src/jvm/jvm.cpp
+++ b/src/jvm/jvm.cpp
@@ -308,7 +308,7 @@ Jvm::Field Jvm::findStaticField(
}
-jobject Jvm::invoke(const Constructor& ctor, ...)
+jobject Jvm::invoke(const Constructor ctor, ...)
{
Env env;
va_list args;
@@ -817,7 +817,7 @@ void Jvm::check(JNIEnv* env)
// they use (i.e., Jvm::invokeV<void>, Jvm::invokeStaticV<void>).
template <>
-void Jvm::invoke<void>(const jobject receiver, const Method& method, ...)
+void Jvm::invoke<void>(const jobject receiver, const Method method, ...)
{
va_list args;
va_start(args, method);
@@ -827,7 +827,7 @@ void Jvm::invoke<void>(const jobject receiver, const Method& method, ...)
template <>
-void Jvm::invokeStatic<void>(const Method& method, ...)
+void Jvm::invokeStatic<void>(const Method method, ...)
{
va_list args;
va_start(args, method);
http://git-wip-us.apache.org/repos/asf/mesos/blob/162a7f5d/src/jvm/jvm.hpp
----------------------------------------------------------------------
diff --git a/src/jvm/jvm.hpp b/src/jvm/jvm.hpp
index b4dff78..2d3a7eb 100644
--- a/src/jvm/jvm.hpp
+++ b/src/jvm/jvm.hpp
@@ -412,13 +412,13 @@ public:
// calls. Possibly a way to do this with typelists, type
// concatenation and unwinding builder inheritance.
- jobject invoke(const Constructor& ctor, ...);
+ jobject invoke(const Constructor ctor, ...);
template <typename T>
- T invoke(const jobject receiver, const Method& method, ...);
+ T invoke(const jobject receiver, const Method method, ...);
template <typename T>
- T invokeStatic(const Method& method, ...);
+ T invokeStatic(const Method method, ...);
template <typename T>
void setField(jobject receiver, const Field& field, T t);
@@ -463,11 +463,11 @@ private:
template <>
-void Jvm::invoke<void>(const jobject receiver, const Method& method, ...);
+void Jvm::invoke<void>(const jobject receiver, const Method method, ...);
template <typename T>
-T Jvm::invoke(const jobject receiver, const Method& method, ...)
+T Jvm::invoke(const jobject receiver, const Method method, ...)
{
va_list args;
va_start(args, method);
@@ -478,11 +478,11 @@ T Jvm::invoke(const jobject receiver, const Method& method, ...)
template <>
-void Jvm::invokeStatic<void>(const Method& method, ...);
+void Jvm::invokeStatic<void>(const Method method, ...);
template <typename T>
-T Jvm::invokeStatic(const Method& method, ...)
+T Jvm::invokeStatic(const Method method, ...)
{
va_list args;
va_start(args, method);
http://git-wip-us.apache.org/repos/asf/mesos/blob/162a7f5d/src/messages/state.hpp
----------------------------------------------------------------------
diff --git a/src/messages/state.hpp b/src/messages/state.hpp
index 6245499..d10c0de 100644
--- a/src/messages/state.hpp
+++ b/src/messages/state.hpp
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-#ifndef __MESSAGE_STATE_HPP__
+#ifndef __MESSAGES_STATE_HPP__
#define __MESSAGES_STATE_HPP__
#include "messages/state.pb.h"