hotspot/src/share/vm/memory/gcLocker.hpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_HDR
  #pragma ident "@(#)gcLocker.hpp 1.60 07/05/17 15:54:47 JVM"
  #endif
  /*
!  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_HDR
  #pragma ident "@(#)gcLocker.hpp 1.60 07/05/17 15:54:47 JVM"
  #endif
  /*
!  * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 185,195 ****
   private:  
    bool _activated;
    Thread *_thread;
   public:
  #ifdef ASSERT
!   No_Safepoint_Verifier(bool activated = true, bool verifygc = true ) : No_GC_Verifier(verifygc) {      
      _thread = Thread::current();
      if (_activated) {
        _thread->_allow_allocation_count++;
        _thread->_allow_safepoint_count++;
      }
--- 185,197 ----
   private:  
    bool _activated;
    Thread *_thread;
   public:
  #ifdef ASSERT
!   No_Safepoint_Verifier(bool activated = true, bool verifygc = true ) :
!     No_GC_Verifier(verifygc),
!     _activated(activated) {
      _thread = Thread::current();
      if (_activated) {
        _thread->_allow_allocation_count++;
        _thread->_allow_safepoint_count++;
      }