comparison src/share/vm/oops/klassKlass.cpp @ 1713:7fcd5f39bd7a

Merge
author johnc
date Sat, 14 Aug 2010 00:47:52 -0700
parents 126ea7725993 9d7a8ab3736b
children 79d04223b8a5 f95d63e2154a
comparison
equal deleted inserted replaced
1695:21e519b91576 1713:7fcd5f39bd7a
159 MarkSweep::adjust_pointer(k->adr_next_sibling()); 159 MarkSweep::adjust_pointer(k->adr_next_sibling());
160 return size; 160 return size;
161 } 161 }
162 162
163 #ifndef SERIALGC 163 #ifndef SERIALGC
164 void klassKlass::oop_copy_contents(PSPromotionManager* pm, oop obj) {
165 }
166
167 void klassKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { 164 void klassKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
168 } 165 }
169 166
170 int klassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { 167 int klassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) {
171 Klass* k = Klass::cast(klassOop(obj)); 168 Klass* k = Klass::cast(klassOop(obj));