comparison src/share/vm/memory/referenceProcessor.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children d8041d695d19
comparison
equal deleted inserted replaced
12355:cefad50507d8 12356:359f7e70ae7f
302 } 302 }
303 #endif 303 #endif
304 JNIHandles::weak_oops_do(is_alive, keep_alive); 304 JNIHandles::weak_oops_do(is_alive, keep_alive);
305 complete_gc->do_void(); 305 complete_gc->do_void();
306 } 306 }
307
307 308
308 template <class T> 309 template <class T>
309 bool enqueue_discovered_ref_helper(ReferenceProcessor* ref, 310 bool enqueue_discovered_ref_helper(ReferenceProcessor* ref,
310 AbstractRefProcTaskExecutor* task_executor) { 311 AbstractRefProcTaskExecutor* task_executor) {
311 312