diff src/share/vm/oops/cpCacheKlass.hpp @ 2264:a97fd181b813

Merge
author kvn
date Wed, 23 Feb 2011 11:18:16 -0800
parents c5a923563727
children 1d1603768966
line wrap: on
line diff
--- a/src/share/vm/oops/cpCacheKlass.hpp	Tue Feb 22 15:26:36 2011 -0800
+++ b/src/share/vm/oops/cpCacheKlass.hpp	Wed Feb 23 11:18:16 2011 -0800
@@ -39,7 +39,7 @@
 
   // Allocation
   DEFINE_ALLOCATE_PERMANENT(constantPoolCacheKlass);
-  constantPoolCacheOop allocate(int length, bool is_conc_safe, TRAPS);
+  constantPoolCacheOop allocate(int length, TRAPS);
   static klassOop create_klass(TRAPS);
 
   // Casting from klassOop
@@ -55,7 +55,6 @@
   // Garbage collection
   void oop_follow_contents(oop obj);
   int oop_adjust_pointers(oop obj);
-  virtual bool oop_is_conc_safe(oop obj) const;
 
   // Parallel Scavenge and Parallel Old
   PARALLEL_GC_DECLS