Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiTagMap.hpp @ 8506:c3657d00e343
-Merge with tip
| author | Christos Kotselidis <christos.kotselidis@oracle.com> |
|---|---|
| date | Thu, 21 Mar 2013 14:11:13 +0100 |
| parents | 8b46b0196eb0 |
| children |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiTagMap.hpp Thu Mar 21 11:30:38 2013 +0100 +++ b/src/share/vm/prims/jvmtiTagMap.hpp Thu Mar 21 14:11:13 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, 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 @@ -27,14 +27,12 @@ #ifndef SHARE_VM_PRIMS_JVMTITAGMAP_HPP #define SHARE_VM_PRIMS_JVMTITAGMAP_HPP -#ifndef JVMTI_KERNEL #include "gc_interface/collectedHeap.hpp" #include "jvmtifiles/jvmti.h" #include "jvmtifiles/jvmtiEnv.hpp" #include "memory/allocation.hpp" #include "memory/genCollectedHeap.hpp" #include "memory/universe.hpp" -#endif // forward references class JvmtiTagHashmap;