Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiRawMonitor.cpp @ 20804:7848fc12602b
Merge with jdk8u40-b25
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 14:58:49 +0200 |
parents | ce8f6bb717c9 |
children |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiRawMonitor.cpp Tue Apr 07 11:20:51 2015 +0200 +++ b/src/share/vm/prims/jvmtiRawMonitor.cpp Tue Apr 07 14:58:49 2015 +0200 @@ -25,7 +25,8 @@ #include "precompiled.hpp" #include "prims/jvmtiRawMonitor.hpp" #include "runtime/interfaceSupport.hpp" -#include "runtime/thread.hpp" +#include "runtime/orderAccess.inline.hpp" +#include "runtime/thread.inline.hpp" GrowableArray<JvmtiRawMonitor*> *JvmtiPendingMonitors::_monitors = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<JvmtiRawMonitor*>(1,true);