Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/jvmtiLib.xsl @ 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 | 70f715dfbb41 da91efe96a93 |
| children | 359f7e70ae7f |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiLib.xsl Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/prims/jvmtiLib.xsl Mon Nov 12 23:14:12 2012 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 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 @@ -809,7 +809,7 @@ </xsl:template> <xsl:template match="jmethodID" mode="HotSpotJavaType"> - <xsl:text>methodOop</xsl:text> + <xsl:text>Method*</xsl:text> </xsl:template> <xsl:template match="jfieldID" mode="HotSpotJavaType">