8003259: NPG: Build with gcc 4.7.2 broken by 7045397

Wed, 14 Nov 2012 22:37:38 -0500

author
coleenp
date
Wed, 14 Nov 2012 22:37:38 -0500
changeset 4265
0400886d2613
parent 4264
6bc207d87e5d
child 4266
c5d4acbb943d

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

src/share/vm/memory/binaryTreeDictionary.cpp file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/vm/memory/binaryTreeDictionary.cpp	Fri Nov 09 00:38:31 2012 +0100
     1.2 +++ b/src/share/vm/memory/binaryTreeDictionary.cpp	Wed Nov 14 22:37:38 2012 -0500
     1.3 @@ -239,7 +239,7 @@
     1.4    } else {
     1.5      if (nextTC == NULL) {
     1.6        // Removing chunk at tail of list
     1.7 -      link_tail(prevFC);
     1.8 +      this->link_tail(prevFC);
     1.9      }
    1.10      // Chunk is interior to the list
    1.11      prevFC->link_after(nextTC);
    1.12 @@ -296,7 +296,7 @@
    1.13  
    1.14    Chunk_t* fc = tail();
    1.15    fc->link_after(chunk);
    1.16 -  link_tail(chunk);
    1.17 +  this->link_tail(chunk);
    1.18  
    1.19    assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list");
    1.20    FreeList_t<Chunk_t>::increment_count();
    1.21 @@ -323,7 +323,7 @@
    1.22      chunk->link_after(fc);
    1.23    } else {
    1.24      assert(tail() == NULL, "List is inconsistent");
    1.25 -    link_tail(chunk);
    1.26 +    this->link_tail(chunk);
    1.27    }
    1.28    head()->link_after(chunk);
    1.29    assert(!head() || size() == head()->size(), "Wrong sized chunk in list");
    1.30 @@ -940,7 +940,7 @@
    1.31    void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
    1.32      if (tl != NULL) {
    1.33        do_tree(tl->left());
    1.34 -      do_list(tl);
    1.35 +      this->do_list(tl);
    1.36        do_tree(tl->right());
    1.37      }
    1.38    }
    1.39 @@ -952,7 +952,7 @@
    1.40    void do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
    1.41      if (tl != NULL) {
    1.42        do_tree(tl->right());
    1.43 -      do_list(tl);
    1.44 +      this->do_list(tl);
    1.45        do_tree(tl->left());
    1.46      }
    1.47    }
    1.48 @@ -1022,7 +1022,7 @@
    1.49    bool do_tree(TreeList<Chunk_t, FreeList_t>* tl) {
    1.50      if (tl != NULL) {
    1.51        if (do_tree(tl->right())) return true;
    1.52 -      if (do_list(tl)) return true;
    1.53 +      if (this->do_list(tl)) return true;
    1.54        if (do_tree(tl->left())) return true;
    1.55      }
    1.56      return false;

mercurial