Mercurial > hg > truffle
diff src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp @ 8737:71f619500f9b
Merge
| author | kevinw |
|---|---|
| date | Mon, 11 Mar 2013 15:37:10 +0100 |
| parents | 63e54c37ac64 |
| children | 4614a598dae1 |
line wrap: on
line diff
--- a/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Mon Mar 11 12:56:00 2013 +0000 +++ b/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Mon Mar 11 15:37:10 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,8 +25,9 @@ #ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP #define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP -#include "runtime/atomic.hpp" +#include "runtime/atomic.inline.hpp" #include "runtime/orderAccess.hpp" +#include "runtime/os.hpp" #include "vm_version_x86.hpp" // Implementation of class OrderAccess.