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;
