Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorkbarrett
Thu, 25 Feb 2016 01:23:10 +0100
changeset 36360 b8f3e1f238ff
parent 36358 4283dc44b9ba (current diff)
parent 36359 05fb53b2a533 (diff)
child 36362 3113b1b523c4
Merge
--- a/hotspot/src/share/vm/oops/typeArrayOop.hpp	Wed Feb 24 22:22:41 2016 +0000
+++ b/hotspot/src/share/vm/oops/typeArrayOop.hpp	Thu Feb 25 01:23:10 2016 +0100
@@ -129,7 +129,7 @@
   Metadata* metadata_at(int which) const {
     return (Metadata*)*long_at_addr(which); }
   void metadata_at_put(int which, Metadata* contents) {
-    *long_at_addr(which) = (long)contents;
+    *long_at_addr(which) = (jlong)contents;
   }
 #else
   Metadata* metadata_at(int which) const {
jdk-sandbox