Mercurial > hg > truffle
diff src/share/vm/oops/objArrayOop.hpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 21:40:27 +0100 |
parents | dc467e8b2c5e |
children | d8ce2825b193 |
line wrap: on
line diff
--- a/src/share/vm/oops/objArrayOop.hpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/oops/objArrayOop.hpp Sat Dec 17 21:40:27 2011 +0100 @@ -34,7 +34,7 @@ friend class objArrayKlass; friend class Runtime1; friend class psPromotionManager; - friend class CSMarkOopClosure; + friend class CSetMarkOopClosure; friend class G1ParScanPartialArrayClosure; template <class T> T* obj_at_addr(int index) const {