src/share/vm/gc/serial/defNewGeneration.hpp

*** 152,164 ****
      return n > alignment ? align_size_down(n, alignment) : alignment;
    }
  
   public:  // was "protected" but caused compile error on win32
    class IsAliveClosure: public BoolObjectClosure {
!     Generation* _g;
    public:
!     IsAliveClosure(Generation* g);
      bool do_object_b(oop p);
    };
  
    class KeepAliveClosure: public OopClosure {
    protected:
--- 152,164 ----
      return n > alignment ? align_size_down(n, alignment) : alignment;
    }
  
   public:  // was "protected" but caused compile error on win32
    class IsAliveClosure: public BoolObjectClosure {
!     Generation* _young_gen;
    public:
!     IsAliveClosure(Generation* young_gen);
      bool do_object_b(oop p);
    };
  
    class KeepAliveClosure: public OopClosure {
    protected:
*** 181,215 ****
      virtual void do_oop(narrowOop* p);
    };
  
    class EvacuateFollowersClosure: public VoidClosure {
      GenCollectedHeap* _gch;
-     int _level;
      ScanClosure* _scan_cur_or_nonheap;
      ScanClosure* _scan_older;
    public:
!     EvacuateFollowersClosure(GenCollectedHeap* gch, int level,
                               ScanClosure* cur, ScanClosure* older);
      void do_void();
    };
  
    class FastEvacuateFollowersClosure: public VoidClosure {
      GenCollectedHeap* _gch;
-     int _level;
      DefNewGeneration* _gen;
      FastScanClosure* _scan_cur_or_nonheap;
      FastScanClosure* _scan_older;
    public:
!     FastEvacuateFollowersClosure(GenCollectedHeap* gch, int level,
!                                  DefNewGeneration* gen,
                                   FastScanClosure* cur,
                                   FastScanClosure* older);
      void do_void();
    };
  
   public:
!   DefNewGeneration(ReservedSpace rs, size_t initial_byte_size, int level,
                     const char* policy="Copy");
  
    virtual void ref_processor_init();
  
    virtual Generation::Name kind() { return Generation::DefNew; }
--- 181,212 ----
      virtual void do_oop(narrowOop* p);
    };
  
    class EvacuateFollowersClosure: public VoidClosure {
      GenCollectedHeap* _gch;
      ScanClosure* _scan_cur_or_nonheap;
      ScanClosure* _scan_older;
    public:
!     EvacuateFollowersClosure(GenCollectedHeap* gch,
                               ScanClosure* cur, ScanClosure* older);
      void do_void();
    };
  
    class FastEvacuateFollowersClosure: public VoidClosure {
      GenCollectedHeap* _gch;
      DefNewGeneration* _gen;
      FastScanClosure* _scan_cur_or_nonheap;
      FastScanClosure* _scan_older;
    public:
!     FastEvacuateFollowersClosure(GenCollectedHeap* gch,
                                   FastScanClosure* cur,
                                   FastScanClosure* older);
      void do_void();
    };
  
   public:
!   DefNewGeneration(ReservedSpace rs, size_t initial_byte_size,
                     const char* policy="Copy");
  
    virtual void ref_processor_init();
  
    virtual Generation::Name kind() { return Generation::DefNew; }