# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1376696725 -7200
# Node ID dae9dd07896fb3537fdad1eeada8903f12b89c26
# Parent  0b0228ed33b883ce3bb49e407510a3086c413118# Parent  39e83065426eda7cc04a04ea8d298683f1d65322
Merge.

diff -r 39e83065426e -r dae9dd07896f src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp
--- a/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	Sat Aug 17 00:54:06 2013 +0200
+++ b/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	Sat Aug 17 01:45:25 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