Mercurial > hg > graal-compiler
diff src/share/vm/memory/binaryTreeDictionary.cpp @ 6119:a297b0e14605
7172226: HotSpot fails to build with GCC 4.7 because of stricter c++ argument dependent lookup
Summary: Add "using" keyword to import base class functions from FreeList<T> to fix template name lookup in gcc 4.7
Reviewed-by: brutisso, iveresov
author | mgerdin |
---|---|
date | Mon, 04 Jun 2012 09:21:53 +0200 |
parents | f69a5d43dc19 |
children | 685df3c6f84b |
line wrap: on
line diff
--- a/src/share/vm/memory/binaryTreeDictionary.cpp Fri Jun 01 15:30:44 2012 -0700 +++ b/src/share/vm/memory/binaryTreeDictionary.cpp Mon Jun 04 09:21:53 2012 +0200 @@ -230,7 +230,7 @@ link_tail(chunk); assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list"); - FreeList<Chunk>::increment_count(); + increment_count(); debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));) assert(head() == NULL || head()->prev() == NULL, "list invariant"); assert(tail() == NULL || tail()->next() == NULL, "list invariant"); @@ -258,7 +258,7 @@ } head()->link_after(chunk); assert(!head() || size() == head()->size(), "Wrong sized chunk in list"); - FreeList<Chunk>::increment_count(); + increment_count(); debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));) assert(head() == NULL || head()->prev() == NULL, "list invariant"); assert(tail() == NULL || tail()->next() == NULL, "list invariant"); @@ -909,6 +909,7 @@ template <class Chunk> class AscendTreeCensusClosure : public TreeCensusClosure<Chunk> { + using TreeCensusClosure<Chunk>::do_list; public: void do_tree(TreeList<Chunk>* tl) { if (tl != NULL) { @@ -921,6 +922,7 @@ template <class Chunk> class DescendTreeCensusClosure : public TreeCensusClosure<Chunk> { + using TreeCensusClosure<Chunk>::do_list; public: void do_tree(TreeList<Chunk>* tl) { if (tl != NULL) { @@ -987,6 +989,7 @@ template <class Chunk> class DescendTreeSearchClosure : public TreeSearchClosure<Chunk> { + using TreeSearchClosure<Chunk>::do_list; public: bool do_tree(TreeList<Chunk>* tl) { if (tl != NULL) {