Mercurial > hg > graal-jvmci-8

changeset 1134:0910903272e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author twisti
date Mon, 04 Jan 2010 07:04:46 -0800
parents 896da934748c (diff) aa62b9388fce (current diff)
children e66fd840cb6b
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp	Mon Jan 04 15:52:40 2010 +0100
+++ b/src/share/vm/prims/jni.cpp	Mon Jan 04 07:04:46 2010 -0800
@@ -3241,7 +3241,7 @@
     jint b = Atomic::xchg(0xdeadbeef, &a);
     void *c = &a;
     void *d = Atomic::xchg_ptr(&b, &c);
-    assert(a == 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
+    assert(a == (jint) 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
     assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
   }
 #endif // ZERO && ASSERT