diff options
author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-21 23:35:13 (GMT) |
---|---|---|
committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-21 23:35:13 (GMT) |
commit | 4843022bf4755d7fafe58faee430a6f62f51ca8f (patch) | |
tree | 34ce84fbfdbfb720b4aae4ae575f296341bbccab /tests/CSGTextCache.cc | |
parent | e31bb0f60312e692f5ef57fd3823e413cc8a669c (diff) | |
parent | b211fe5158160910c73397bc401fb846c45a7295 (diff) |
Merge remote branch 'upstream/master' into cakebaby
Diffstat (limited to 'tests/CSGTextCache.cc')
-rw-r--r-- | tests/CSGTextCache.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/CSGTextCache.cc b/tests/CSGTextCache.cc index 4234c63..e512dfb 100644 --- a/tests/CSGTextCache.cc +++ b/tests/CSGTextCache.cc @@ -2,23 +2,23 @@ bool CSGTextCache::contains(const AbstractNode &node) const { - return this->cache.contains(this->tree.getString(node)); + return this->cache.find(this->tree.getString(node)) != this->cache.end(); } // We cannot return a reference since the [] operator returns a temporary value string CSGTextCache::operator[](const AbstractNode &node) const { - return this->cache[this->tree.getString(node)]; + return this->cache.at(this->tree.getString(node)); } void CSGTextCache::insert(const class AbstractNode &node, const string & value) { - this->cache.insert(this->tree.getString(node), value); + this->cache.insert(std::make_pair(this->tree.getString(node), value)); } void CSGTextCache::remove(const class AbstractNode &node) { - this->cache.remove(this->tree.getString(node)); + this->cache.erase(this->tree.getString(node)); } void CSGTextCache::clear() |