diff src/share/vm/utilities/globalDefinitions.hpp @ 12873:4e7f99b70d9d

Merge
author adlertz
date Wed, 09 Oct 2013 05:03:34 -0700
parents 190899198332
children cefad50507d8 c90e76575b03
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions.hpp	Wed Oct 09 13:00:20 2013 +0200
+++ b/src/share/vm/utilities/globalDefinitions.hpp	Wed Oct 09 05:03:34 2013 -0700
@@ -967,9 +967,9 @@
 // (These must be implemented as #defines because C++ compilers are
 // not obligated to inline non-integral constants!)
 #define       badAddress        ((address)::badAddressVal)
-#define       badOop            ((oop)::badOopVal)
+#define       badOop            (cast_to_oop(::badOopVal))
 #define       badHeapWord       (::badHeapWordVal)
-#define       badJNIHandle      ((oop)::badJNIHandleVal)
+#define       badJNIHandle      (cast_to_oop(::badJNIHandleVal))
 
 // Default TaskQueue size is 16K (32-bit) or 128K (64-bit)
 #define TASKQUEUE_SIZE (NOT_LP64(1<<14) LP64_ONLY(1<<17))