comparison src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents 5baec2e69518
children 7df93f7c14a5
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
127 buf.append(_print_format, sum); 127 buf.append(_print_format, sum);
128 } 128 }
129 buf.append_and_print_cr("]"); 129 buf.append_and_print_cr("]");
130 } 130 }
131 131
132 #ifdef ASSERT 132 #ifndef PRODUCT
133 133
134 template <class T> 134 template <class T>
135 void WorkerDataArray<T>::reset() { 135 void WorkerDataArray<T>::reset() {
136 for (uint i = 0; i < _length; i++) { 136 for (uint i = 0; i < _length; i++) {
137 _data[i] = (T)-1; 137 _data[i] = (T)-1;