Merge

Thu, 13 Dec 2012 09:06:38 -0800

author
stefank
date
Thu, 13 Dec 2012 09:06:38 -0800
changeset 4337
4459ef2189f5
parent 4335
2aa953165ade
parent 4336
db8a7163c682
child 4339
807f1d348f7b
child 4368
0b3d19153cc6

Merge

     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp	Thu Dec 13 10:09:49 2012 +0100
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp	Thu Dec 13 09:06:38 2012 -0800
     1.3 @@ -24,6 +24,7 @@
     1.4  
     1.5  #include "precompiled.hpp"
     1.6  #include "gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp"
     1.7 +#include "memory/allocation.inline.hpp"
     1.8  #include "runtime/java.hpp"
     1.9  
    1.10  AdjoiningVirtualSpaces::AdjoiningVirtualSpaces(ReservedSpace rs,
     2.1 --- a/src/share/vm/gc_implementation/shared/gcStats.cpp	Thu Dec 13 10:09:49 2012 +0100
     2.2 +++ b/src/share/vm/gc_implementation/shared/gcStats.cpp	Thu Dec 13 09:06:38 2012 -0800
     2.3 @@ -25,6 +25,7 @@
     2.4  #include "precompiled.hpp"
     2.5  #include "gc_implementation/shared/gcStats.hpp"
     2.6  #include "gc_implementation/shared/gcUtil.hpp"
     2.7 +#include "memory/allocation.inline.hpp"
     2.8  
     2.9  GCStats::GCStats() {
    2.10      _avg_promoted       = new AdaptivePaddedNoZeroDevAverage(

mercurial