summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-08-01 23:13:31 (GMT)
committerEvan Martin <martine@danga.com>2012-08-01 23:13:31 (GMT)
commit649ad87148d5b4998cac7ce82eff29648db02554 (patch)
treec70b93dbe7b4f68910f2920a178080fbe49ac877
parentd82e806729bed17bf8fba738ed63eb740863c79e (diff)
parentff877afa28f8fb1732b8183f1d7a26e16ba39113 (diff)
downloadNinja-649ad87148d5b4998cac7ce82eff29648db02554.zip
Ninja-649ad87148d5b4998cac7ce82eff29648db02554.tar.gz
Ninja-649ad87148d5b4998cac7ce82eff29648db02554.tar.bz2
Merge branch 'master' of github.com:martine/ninja
-rw-r--r--src/hash_map.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hash_map.h b/src/hash_map.h
index 658f699..88c2681 100644
--- a/src/hash_map.h
+++ b/src/hash_map.h
@@ -55,16 +55,16 @@ using stdext::hash_compare;
struct StringPieceCmp : public hash_compare<StringPiece> {
size_t operator()(const StringPiece& key) const {
- return MurmurHash2(key.str(), key.len());
+ return MurmurHash2(key.str_, key.len_);
}
bool operator()(const StringPiece& a, const StringPiece& b) const {
- int cmp = strncmp(a.str(), b.str(), min(a.len(), b.len()));
+ int cmp = strncmp(a.str_, b.str_, min(a.len_, b.len_));
if (cmp < 0) {
return true;
} else if (cmp > 0) {
return false;
} else {
- return a.len() < b.len();
+ return a.len_ < b.len_;
}
}
};