# HG changeset patch
# User ehelin
# Date 1376958581 25200
# Node ID 878bb0b7e79902cfc5e70b0c61e8d7b3d2e14e3b
# Parent  b1fd869e7df033ce92552dc42a12515cd639d693# Parent  1a8fb39bdbc4e9f70806160db1946a5a487a3281
Merge

diff -r 1a8fb39bdbc4 -r 878bb0b7e799 src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp
--- a/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	Wed Aug 07 16:47:32 2013 +0200
+++ b/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	Mon Aug 19 17:29:41 2013 -0700
@@ -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