src/share/vm/gc/g1/g1CollectedHeap.hpp

*** 1130,1140 ****
  
    inline void old_set_add(HeapRegion* hr);
    inline void old_set_remove(HeapRegion* hr);
  
    size_t non_young_capacity_bytes() {
!     return _old_set.total_capacity_bytes() + _humongous_set.total_capacity_bytes();
    }
  
    void set_free_regions_coming();
    void reset_free_regions_coming();
    bool free_regions_coming() { return _free_regions_coming; }
--- 1130,1140 ----
  
    inline void old_set_add(HeapRegion* hr);
    inline void old_set_remove(HeapRegion* hr);
  
    size_t non_young_capacity_bytes() {
!     return (_old_set.length() + _humongous_set.length()) * HeapRegion::GrainBytes;
    }
  
    void set_free_regions_coming();
    void reset_free_regions_coming();
    bool free_regions_coming() { return _free_regions_coming; }
*** 1155,1165 ****
                                               jint len);
  
    // True iff an evacuation has failed in the most-recent collection.
    bool evacuation_failed() { return _evacuation_failed; }
  
!   void remove_from_old_sets(const HeapRegionSetCount& old_regions_removed, const HeapRegionSetCount& humongous_regions_removed);
    void prepend_to_freelist(FreeRegionList* list);
    void decrement_summary_bytes(size_t bytes);
  
    virtual bool is_in(const void* p) const;
  #ifdef ASSERT
--- 1155,1165 ----
                                               jint len);
  
    // True iff an evacuation has failed in the most-recent collection.
    bool evacuation_failed() { return _evacuation_failed; }
  
!   void remove_from_old_sets(const uint old_regions_removed, const uint humongous_regions_removed);
    void prepend_to_freelist(FreeRegionList* list);
    void decrement_summary_bytes(size_t bytes);
  
    virtual bool is_in(const void* p) const;
  #ifdef ASSERT