提交 64c2d141 编写于 作者: C coleenp

8003259: NPG: Build with gcc 4.7.2 broken by 7045397

Summary: Qualify calls with this pointers to make gcc accept this code.
Reviewed-by: coleenp, andrew
Contributed-by: peter.levart@gmail.com
上级 36c0a962
...@@ -239,7 +239,7 @@ TreeList<Chunk_t, FreeList_t>* TreeList<Chunk_t, FreeList_t>::remove_chunk_repla ...@@ -239,7 +239,7 @@ TreeList<Chunk_t, FreeList_t>* TreeList<Chunk_t, FreeList_t>::remove_chunk_repla
} else { } else {
if (nextTC == NULL) { if (nextTC == NULL) {
// Removing chunk at tail of list // Removing chunk at tail of list
link_tail(prevFC); this->link_tail(prevFC);
} }
// Chunk is interior to the list // Chunk is interior to the list
prevFC->link_after(nextTC); prevFC->link_after(nextTC);
...@@ -296,7 +296,7 @@ void TreeList<Chunk_t, FreeList_t>::return_chunk_at_tail(TreeChunk<Chunk_t, Free ...@@ -296,7 +296,7 @@ void TreeList<Chunk_t, FreeList_t>::return_chunk_at_tail(TreeChunk<Chunk_t, Free
Chunk_t* fc = tail(); Chunk_t* fc = tail();
fc->link_after(chunk); fc->link_after(chunk);
link_tail(chunk); this->link_tail(chunk);
assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list"); assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list");
FreeList_t<Chunk_t>::increment_count(); FreeList_t<Chunk_t>::increment_count();
...@@ -323,7 +323,7 @@ void TreeList<Chunk_t, FreeList_t>::return_chunk_at_head(TreeChunk<Chunk_t, Free ...@@ -323,7 +323,7 @@ void TreeList<Chunk_t, FreeList_t>::return_chunk_at_head(TreeChunk<Chunk_t, Free
chunk->link_after(fc); chunk->link_after(fc);
} else { } else {
assert(tail() == NULL, "List is inconsistent"); assert(tail() == NULL, "List is inconsistent");
link_tail(chunk); this->link_tail(chunk);
} }
head()->link_after(chunk); head()->link_after(chunk);
assert(!head() || size() == head()->size(), "Wrong sized chunk in list"); assert(!head() || size() == head()->size(), "Wrong sized chunk in list");
...@@ -940,7 +940,7 @@ class AscendTreeCensusClosure : public TreeCensusClosure<Chunk_t, FreeList_t> { ...@@ -940,7 +940,7 @@ class AscendTreeCensusClosure : public TreeCensusClosure<Chunk_t, FreeList_t> {
void do_tree(TreeList<Chunk_t, FreeList_t>* tl) { void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) { if (tl != NULL) {
do_tree(tl->left()); do_tree(tl->left());
do_list(tl); this->do_list(tl);
do_tree(tl->right()); do_tree(tl->right());
} }
} }
...@@ -952,7 +952,7 @@ class DescendTreeCensusClosure : public TreeCensusClosure<Chunk_t, FreeList_t> { ...@@ -952,7 +952,7 @@ class DescendTreeCensusClosure : public TreeCensusClosure<Chunk_t, FreeList_t> {
void do_tree(TreeList<Chunk_t, FreeList_t>* tl) { void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) { if (tl != NULL) {
do_tree(tl->right()); do_tree(tl->right());
do_list(tl); this->do_list(tl);
do_tree(tl->left()); do_tree(tl->left());
} }
} }
...@@ -1022,7 +1022,7 @@ class DescendTreeSearchClosure : public TreeSearchClosure<Chunk_t, FreeList_t> { ...@@ -1022,7 +1022,7 @@ class DescendTreeSearchClosure : public TreeSearchClosure<Chunk_t, FreeList_t> {
bool do_tree(TreeList<Chunk_t, FreeList_t>* tl) { bool do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) { if (tl != NULL) {
if (do_tree(tl->right())) return true; if (do_tree(tl->right())) return true;
if (do_list(tl)) return true; if (this->do_list(tl)) return true;
if (do_tree(tl->left())) return true; if (do_tree(tl->left())) return true;
} }
return false; return false;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册