Mercurial > hg > graal-jvmci-8
diff src/share/vm/oops/oop.inline2.hpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | f95d63e2154a |
children | da91efe96a93 |
line wrap: on
line diff
--- a/src/share/vm/oops/oop.inline2.hpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/oops/oop.inline2.hpp Fri Jan 07 18:18:08 2011 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2010, 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 @@ -22,6 +22,15 @@ * */ +#ifndef SHARE_VM_OOPS_OOP_INLINE2_HPP +#define SHARE_VM_OOPS_OOP_INLINE2_HPP + +#include "gc_interface/collectedHeap.hpp" +#include "memory/generation.hpp" +#include "memory/permGen.hpp" +#include "memory/universe.hpp" +#include "oops/oop.hpp" + // Implementation of all inlined member functions defined in oop.hpp // We need a separate file to avoid circular references @@ -38,3 +47,5 @@ inline bool oopDesc::is_scavengable() const { return Universe::heap()->is_scavengable(this); } + +#endif // SHARE_VM_OOPS_OOP_INLINE2_HPP