1.1 --- a/src/share/vm/gc_implementation/shared/gcUtil.hpp Wed Jun 27 15:23:36 2012 +0200 1.2 +++ b/src/share/vm/gc_implementation/shared/gcUtil.hpp Thu Jun 28 17:03:16 2012 -0400 1.3 @@ -43,7 +43,7 @@ 1.4 // 1.5 // This serves as our best estimate of a future unknown. 1.6 // 1.7 -class AdaptiveWeightedAverage : public CHeapObj { 1.8 +class AdaptiveWeightedAverage : public CHeapObj<mtGC> { 1.9 private: 1.10 float _average; // The last computed average 1.11 unsigned _sample_count; // How often we've sampled this average 1.12 @@ -146,7 +146,7 @@ 1.13 // Placement support 1.14 void* operator new(size_t ignored, void* p) { return p; } 1.15 // Allocator 1.16 - void* operator new(size_t size) { return CHeapObj::operator new(size); } 1.17 + void* operator new(size_t size) { return CHeapObj<mtGC>::operator new(size); } 1.18 1.19 // Accessor 1.20 float padded_average() const { return _padded_avg; } 1.21 @@ -192,7 +192,7 @@ 1.22 // equation. 1.23 // y = intercept + slope * x 1.24 1.25 -class LinearLeastSquareFit : public CHeapObj { 1.26 +class LinearLeastSquareFit : public CHeapObj<mtGC> { 1.27 double _sum_x; // sum of all independent data points x 1.28 double _sum_x_squared; // sum of all independent data points x**2 1.29 double _sum_y; // sum of all dependent data points y