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
--- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Fri Nov 09 00:38:31 2012 +0100
+++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp Wed Nov 14 22:37:38 2012 -0500
@@ -239,7 +239,7 @@
} else {
if (nextTC == NULL) {
// Removing chunk at tail of list
- link_tail(prevFC);
+ this->link_tail(prevFC);
}
// Chunk is interior to the list
prevFC->link_after(nextTC);
@@ -296,7 +296,7 @@
Chunk_t* fc = tail();
fc->link_after(chunk);
- link_tail(chunk);
+ this->link_tail(chunk);
assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list");
FreeList_t<Chunk_t>::increment_count();
@@ -323,7 +323,7 @@
chunk->link_after(fc);
} else {
assert(tail() == NULL, "List is inconsistent");
- link_tail(chunk);
+ this->link_tail(chunk);
}
head()->link_after(chunk);
assert(!head() || size() == head()->size(), "Wrong sized chunk in list");
@@ -940,7 +940,7 @@
void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) {
do_tree(tl->left());
- do_list(tl);
+ this->do_list(tl);
do_tree(tl->right());
}
}
@@ -952,7 +952,7 @@
void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) {
do_tree(tl->right());
- do_list(tl);
+ this->do_list(tl);
do_tree(tl->left());
}
}
@@ -1022,7 +1022,7 @@
bool do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
if (tl != NULL) {
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;
}
return false;