# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1376704516 -7200
# Node ID ca5054bbfcdd9d53ab24fecd1c79dbe781f7888a
# Parent  dae9dd07896fb3537fdad1eeada8903f12b89c26# Parent  87cab8081da4503613c92b1492c5856f0e0e302d
Merge.

diff -r 87cab8081da4 -r ca5054bbfcdd src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp
--- a/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	Fri Aug 16 17:22:34 2013 -0700
+++ b/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	Sat Aug 17 03:55:16 2013 +0200
@@ -190,7 +190,7 @@
 inline void     OrderAccess::release_store_fence(volatile julong*  p, julong  v) { release_store_fence((volatile jlong*)p,  (jlong)v);  }
 
 inline void     OrderAccess::release_store_fence(volatile jfloat*  p, jfloat  v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store_fence((volatile jlong*)p, jdouble_cast(v)); }
+inline void     OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store_fence((volatile jlong*)p, jlong_cast(v)); }
 
 inline void     OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) {
 #ifdef AMD64