src/hotspot/share/gc/shared/oopStorageParState.hpp

*** 24,34 ****
  
  #ifndef SHARE_GC_SHARED_OOPSTORAGEPARSTATE_HPP
  #define SHARE_GC_SHARED_OOPSTORAGEPARSTATE_HPP
  
  #include "gc/shared/oopStorage.hpp"
- #include "memory/allocation.hpp"
  #include "utilities/macros.hpp"
  
  #if INCLUDE_ALL_GCS
  
  //////////////////////////////////////////////////////////////////////////////
--- 24,33 ----
*** 138,148 ****
  //
  //   If *p == NULL then neither is_alive nor cl will be invoked for p.
  //   If is_alive->do_object_b(*p) is false, then cl will not be
  //   invoked on p.
  
! class OopStorage::BasicParState VALUE_OBJ_CLASS_SPEC {
    OopStorage* _storage;
    void* volatile _next_block;
    bool _concurrent;
  
    // Noncopyable.
--- 137,147 ----
  //
  //   If *p == NULL then neither is_alive nor cl will be invoked for p.
  //   If is_alive->do_object_b(*p) is false, then cl will not be
  //   invoked on p.
  
! class OopStorage::BasicParState {
    OopStorage* _storage;
    void* volatile _next_block;
    bool _concurrent;
  
    // Noncopyable.
*** 162,172 ****
  
    template<bool is_const, typename F> void iterate(F f);
  };
  
  template<bool concurrent, bool is_const>
! class OopStorage::ParState VALUE_OBJ_CLASS_SPEC {
    BasicParState _basic_state;
  
  public:
    ParState(const OopStorage* storage) :
      // For simplicity, always recorded as non-const.
--- 161,171 ----
  
    template<bool is_const, typename F> void iterate(F f);
  };
  
  template<bool concurrent, bool is_const>
! class OopStorage::ParState {
    BasicParState _basic_state;
  
  public:
    ParState(const OopStorage* storage) :
      // For simplicity, always recorded as non-const.
*** 176,186 ****
    template<typename F> void iterate(F f);
    template<typename Closure> void oops_do(Closure* cl);
  };
  
  template<>
! class OopStorage::ParState<false, false> VALUE_OBJ_CLASS_SPEC {
    BasicParState _basic_state;
  
  public:
    ParState(OopStorage* storage) :
      _basic_state(storage, false)
--- 175,185 ----
    template<typename F> void iterate(F f);
    template<typename Closure> void oops_do(Closure* cl);
  };
  
  template<>
! class OopStorage::ParState<false, false> {
    BasicParState _basic_state;
  
  public:
    ParState(OopStorage* storage) :
      _basic_state(storage, false)