Mercurial > hg > graal-jvmci-8
changeset 22652:d6f8d1ffcff0
JDK-8047382
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Thu, 01 Oct 2015 04:55:30 -0700 |
parents | d06159da32c7 |
children | 24aa7495fec9 |
files | src/share/vm/oops/instanceKlass.cpp src/share/vm/services/classLoadingService.cpp |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp Wed Sep 30 12:21:44 2015 +0200 +++ b/src/share/vm/oops/instanceKlass.cpp Thu Oct 01 04:55:30 2015 -0700 @@ -114,7 +114,7 @@ len = name->utf8_length(); \ } \ HS_DTRACE_PROBE4(hotspot, class__initialization__##type, \ - data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type); \ + data, len, (void *)(clss)->class_loader(), thread_type); \ } #define DTRACE_CLASSINIT_PROBE_WAIT(type, clss, thread_type, wait) \ @@ -127,7 +127,7 @@ len = name->utf8_length(); \ } \ HS_DTRACE_PROBE5(hotspot, class__initialization__##type, \ - data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), thread_type, wait); \ + data, len, (void *)(clss)->class_loader(), thread_type, wait); \ } #else /* USDT2 */
--- a/src/share/vm/services/classLoadingService.cpp Wed Sep 30 12:21:44 2015 +0200 +++ b/src/share/vm/services/classLoadingService.cpp Thu Oct 01 04:55:30 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, 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 @@ -52,7 +52,7 @@ len = name->utf8_length(); \ } \ HS_DTRACE_PROBE4(hotspot, class__##type, \ - data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), (shared)); \ + data, len, (void *)(clss)->class_loader(), (shared)); \ } #else /* USDT2 */