comparison src/share/vm/memory/universe.hpp @ 12269:da051ce490eb

Merge
author adlertz
date Thu, 19 Sep 2013 18:01:39 +0200
parents 7944aba7ba41 69f26e8e09f9
children 9d15b81d5d1b
comparison
equal deleted inserted replaced
12253:179cd89fb279 12269:da051ce490eb
177 static oop _vm_exception; 177 static oop _vm_exception;
178 178
179 // The particular choice of collected heap. 179 // The particular choice of collected heap.
180 static CollectedHeap* _collectedHeap; 180 static CollectedHeap* _collectedHeap;
181 181
182 static intptr_t _non_oop_bits;
183
182 // For UseCompressedOops. 184 // For UseCompressedOops.
183 static struct NarrowPtrStruct _narrow_oop; 185 static struct NarrowPtrStruct _narrow_oop;
184 // For UseCompressedClassPointers. 186 // For UseCompressedClassPointers.
185 static struct NarrowPtrStruct _narrow_klass; 187 static struct NarrowPtrStruct _narrow_klass;
186 static address _narrow_ptrs_base; 188 static address _narrow_ptrs_base;