comparison src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp @ 3258:edd9b016deb6

7036021: G1: build failure on win64 and linux with hs21 in jdk6 build environment Summary: Missing parentheses around a casted expression and some missing casts were causing build failures with the jdk6 build tools. Reviewed-by: kvn, brutisso
author johnc
date Fri, 15 Apr 2011 10:10:50 -0700
parents 02f49b66361a
children d2a62e0f25eb
comparison
equal deleted inserted replaced
3257:4080db1b5d0a 3258:edd9b016deb6
170 // allocation was successful; false otherwise. 170 // allocation was successful; false otherwise.
171 bool expand_card_count_cache(int index); 171 bool expand_card_count_cache(int index);
172 172
173 // hash a given key (index of card_ptr) with the specified size 173 // hash a given key (index of card_ptr) with the specified size
174 static unsigned int hash(size_t key, size_t size) { 174 static unsigned int hash(size_t key, size_t size) {
175 return (unsigned int) key % size; 175 return (unsigned int) (key % size);
176 } 176 }
177 177
178 // hash a given key (index of card_ptr) 178 // hash a given key (index of card_ptr)
179 unsigned int hash(size_t key) { 179 unsigned int hash(size_t key) {
180 return hash(key, _n_card_counts); 180 return hash(key, _n_card_counts);
181 } 181 }
182 182
183 unsigned ptr_2_card_num(jbyte* card_ptr) { 183 unsigned int ptr_2_card_num(jbyte* card_ptr) {
184 return (unsigned) (card_ptr - _ct_bot); 184 return (unsigned int) (card_ptr - _ct_bot);
185 } 185 }
186 186
187 jbyte* card_num_2_ptr(unsigned card_num) { 187 jbyte* card_num_2_ptr(unsigned int card_num) {
188 return (jbyte*) (_ct_bot + card_num); 188 return (jbyte*) (_ct_bot + card_num);
189 } 189 }
190 190
191 // Returns the count of this card after incrementing it. 191 // Returns the count of this card after incrementing it.
192 jbyte* add_card_count(jbyte* card_ptr, int* count, bool* defer); 192 jbyte* add_card_count(jbyte* card_ptr, int* count, bool* defer);