summaryrefslogtreecommitdiffstats
path: root/src/parsers.h
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2010-12-19 23:03:23 (GMT)
committerEvan Martin <martine@danga.com>2010-12-19 23:03:23 (GMT)
commit3ec4b428c1e31a2e2b6d8e780277c9aa6af1f702 (patch)
tree2dac469a6bec078b14b24c189e96fa05ebe220e4 /src/parsers.h
parent2449472941530bbe82a80e734261e312a76df56a (diff)
parent3261f368ba73ece86d0fb190bc6205ca682e1ae3 (diff)
downloadNinja-3ec4b428c1e31a2e2b6d8e780277c9aa6af1f702.zip
Ninja-3ec4b428c1e31a2e2b6d8e780277c9aa6af1f702.tar.gz
Ninja-3ec4b428c1e31a2e2b6d8e780277c9aa6af1f702.tar.bz2
Merge remote branch 'origin/master'
Diffstat (limited to 'src/parsers.h')
-rw-r--r--src/parsers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parsers.h b/src/parsers.h
index e3505c9..2655ce8 100644
--- a/src/parsers.h
+++ b/src/parsers.h
@@ -26,12 +26,12 @@ struct Token {
};
explicit Token(Type type) : type_(type) {}
- void Clear() { type_ = NONE; extra_.clear(); }
+ void Clear() { type_ = NONE; }
string AsString() const;
Type type_;
const char* pos_;
- string extra_;
+ const char* end_;
};
struct Tokenizer {