1.1 --- a/src/share/vm/memory/binaryTreeDictionary.hpp Fri Jun 01 15:30:44 2012 -0700
1.2 +++ b/src/share/vm/memory/binaryTreeDictionary.hpp Mon Jun 04 09:21:53 2012 +0200
1.3 @@ -60,13 +60,18 @@
1.4 TreeList<Chunk>* left() const { return _left; }
1.5 TreeList<Chunk>* right() const { return _right; }
1.6
1.7 - // Wrapper on call to base class, to get the template to compile.
1.8 - Chunk* head() const { return FreeList<Chunk>::head(); }
1.9 - Chunk* tail() const { return FreeList<Chunk>::tail(); }
1.10 - void set_head(Chunk* head) { FreeList<Chunk>::set_head(head); }
1.11 - void set_tail(Chunk* tail) { FreeList<Chunk>::set_tail(tail); }
1.12 + // Explicitly import these names into our namespace to fix name lookup with templates
1.13 + using FreeList<Chunk>::head;
1.14 + using FreeList<Chunk>::set_head;
1.15
1.16 - size_t size() const { return FreeList<Chunk>::size(); }
1.17 + using FreeList<Chunk>::tail;
1.18 + using FreeList<Chunk>::set_tail;
1.19 + using FreeList<Chunk>::link_tail;
1.20 +
1.21 + using FreeList<Chunk>::increment_count;
1.22 + NOT_PRODUCT(using FreeList<Chunk>::increment_returned_bytes_by;)
1.23 + using FreeList<Chunk>::verify_chunk_in_free_list;
1.24 + using FreeList<Chunk>::size;
1.25
1.26 // Accessors for links in tree.
1.27
