summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author <ivanpe@chromium.com>2014-03-02 01:37:08 (GMT)
committer <ivanpe@chromium.com>2014-03-02 01:37:08 (GMT)
commita5ffa884137f7687d0393ccba22557d583654a25 (patch)
tree3f6c2b40f8aa70ee7ca27c10aea8f0553f1baa18 /src
parent8367470aa572fa858cce67d6939b337d3909aa07 (diff)
downloadglog-a5ffa884137f7687d0393ccba22557d583654a25.zip
glog-a5ffa884137f7687d0393ccba22557d583654a25.tar.gz
glog-a5ffa884137f7687d0393ccba22557d583654a25.tar.bz2
Build issues in demangle.cc
git-svn-id: https://google-glog.googlecode.com/svn/trunk@141 eb4d4688-79bd-11dd-afb4-1d65580434c0
Diffstat (limited to 'src')
-rw-r--r--src/demangle.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/demangle.cc b/src/demangle.cc
index 0daf308..e858181 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,9 +223,6 @@ 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') {
- return false;
- }
const char *p = char_class;
for (; *p != '\0'; ++p) {
if (state->mangled_cur[0] == *p) {