# HG changeset patch
# User trims
# Date 1250295247 25200
# Node ID ac59d4e6dae51ac5fc31a9a4940d1857f91161b1
# Parent  16314a31b9612d4f25bbc4bbe11298cbd4147fb7# Parent  308762b2bf14063c45ee5a0f44087404840f9016
Merge

diff -r 16314a31b961 -r ac59d4e6dae5 src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Aug 13 17:59:05 2009 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Fri Aug 14 17:14:07 2009 -0700
@@ -2401,7 +2401,7 @@
         // Now process this portion of this one.
         int lim = MIN2(next_arr_ind, len);
         for (int j = arr_ind; j < lim; j++) {
-          do_oop(aobj->obj_at_addr<T>(j));
+          do_oop(aobj->objArrayOopDesc::obj_at_addr<T>(j));
         }
 
       } else {