Mercurial > hg > truffle
diff src/share/vm/ci/ciConstantPoolCache.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | da91efe96a93 |
| children |
line wrap: on
line diff
--- a/src/share/vm/ci/ciConstantPoolCache.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/ci/ciConstantPoolCache.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2012, 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 @@ -32,7 +32,7 @@ // // The class caches indexed constant pool lookups. // -// Usage note: this klass has nothing to do with constantPoolCacheOop. +// Usage note: this klass has nothing to do with ConstantPoolCache*. class ciConstantPoolCache : public ResourceObj { private: GrowableArray<intptr_t>* _keys;