diff src/share/vm/oops/klassOop.hpp @ 4137:04b9a2566eec

Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents b0efc7ee3b31
children 069ab3f976d3
line wrap: on
line diff
--- a/src/share/vm/oops/klassOop.hpp	Sat Dec 17 20:50:09 2011 +0100
+++ b/src/share/vm/oops/klassOop.hpp	Sat Dec 17 21:40:27 2011 +0100
@@ -53,8 +53,10 @@
  private:
   // These have no implementation since klassOop should never be accessed in this fashion
   oop obj_field(int offset) const;
+  volatile oop obj_field_volatile(int offset) const;
   void obj_field_put(int offset, oop value);
-  void obj_field_raw_put(int offset, oop value);
+  void obj_field_put_raw(int offset, oop value);
+  void obj_field_put_volatile(int offset, oop value);
 
   jbyte byte_field(int offset) const;
   void byte_field_put(int offset, jbyte contents);