diff src/share/vm/memory/serialize.cpp @ 994:753cf9794df9

6885169: merge of 4957990 and 6863023 causes conflict on do_nmethods Summary: After mechanically merging changes, some by-hand adjustments are needed. Reviewed-by: ysr
author jrose
date Wed, 23 Sep 2009 23:57:44 -0700
parents 94b6d06fd759
children 89e0543e1737
line wrap: on
line diff