diff src/share/vm/services/classLoadingService.cpp @ 12873:4e7f99b70d9d

Merge
author adlertz
date Wed, 09 Oct 2013 05:03:34 -0700
parents 268e7a2178d7
children e6195383bcaf 78bbf4d43a14
line wrap: on
line diff
--- a/src/share/vm/services/classLoadingService.cpp	Wed Oct 09 13:00:20 2013 +0200
+++ b/src/share/vm/services/classLoadingService.cpp	Wed Oct 09 05:03:34 2013 -0700
@@ -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
@@ -52,7 +52,7 @@
       len = name->utf8_length();                    \
     }                                               \
     HS_DTRACE_PROBE4(hotspot, class__##type,        \
-      data, len, (clss)->class_loader(), (shared)); \
+      data, len, SOLARIS_ONLY((void *))(clss)->class_loader(), (shared)); \
   }
 
 #else /* USDT2 */