Mercurial > hg > truffle
diff src/share/vm/oops/arrayOop.hpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | f95d63e2154a |
children | 6fd81579526f |
line wrap: on
line diff
--- a/src/share/vm/oops/arrayOop.hpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/oops/arrayOop.hpp Fri Jan 07 18:18:08 2011 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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,12 @@ * */ +#ifndef SHARE_VM_OOPS_ARRAYOOP_HPP +#define SHARE_VM_OOPS_ARRAYOOP_HPP + +#include "memory/universe.inline.hpp" +#include "oops/oop.hpp" + // arrayOopDesc is the abstract baseclass for all arrays. It doesn't // declare pure virtual to enforce this because that would allocate a vtbl // in each instance, which we don't want. @@ -113,3 +119,5 @@ return max_element_words / words_per_element; } }; + +#endif // SHARE_VM_OOPS_ARRAYOOP_HPP