Mercurial > hg > graal-jvmci-8

diff src/share/vm/oops/instanceKlass.cpp @ 22967:4390345de45c hs25.60-b12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 17 Apr 2015 01:33:13 -0700
parents d8f133adf05d 6f31df24cec0
children 3c8b53552a43
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.cpp	Wed Apr 15 14:45:14 2015 -0700
+++ b/src/share/vm/oops/instanceKlass.cpp	Fri Apr 17 01:33:13 2015 -0700
@@ -110,7 +110,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) \
@@ -123,7 +123,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 */