summaryrefslogtreecommitdiffstats
path: root/src/lexer.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-07-27 19:39:02 (GMT)
committerEvan Martin <martine@danga.com>2012-07-27 19:39:02 (GMT)
commit1ca513e30ed64a861a293e9cb4b711cf70871540 (patch)
treeb8b61cdaa4b65d3c3b79c4488620688182ead4a4 /src/lexer.cc
parentf7a22e3bc97fdeb87d930b7734680c481c6010bf (diff)
parent904c9610fe66c4f4bd63a07d6f057c8603d24394 (diff)
downloadNinja-1ca513e30ed64a861a293e9cb4b711cf70871540.zip
Ninja-1ca513e30ed64a861a293e9cb4b711cf70871540.tar.gz
Ninja-1ca513e30ed64a861a293e9cb4b711cf70871540.tar.bz2
Merge pull request #352 from tfarina/string-piece-private
Make StringPiece data members private.
Diffstat (limited to 'src/lexer.cc')
-rw-r--r--src/lexer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lexer.cc b/src/lexer.cc
index ca6f367..45bf4ef 100644
--- a/src/lexer.cc
+++ b/src/lexer.cc
@@ -23,8 +23,8 @@
bool Lexer::Error(const string& message, string* err) {
// Compute line/column.
int line = 1;
- const char* context = input_.str_;
- for (const char* p = input_.str_; p < last_token_; ++p) {
+ const char* context = input_.str();
+ for (const char* p = input_.str(); p < last_token_; ++p) {
if (*p == '\n') {
++line;
context = p + 1;
@@ -66,7 +66,7 @@ Lexer::Lexer(const char* input) {
void Lexer::Start(StringPiece filename, StringPiece input) {
filename_ = filename;
input_ = input;
- ofs_ = input_.str_;
+ ofs_ = input_.str();
last_token_ = NULL;
}