src/share/vm/runtime/java.hpp

rev 8203 : imported patch remove_config

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. 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,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. 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.
*** 89,99 ****
    // If partially initialized, the above fields are invalid and we know
    // that we're less than major version 6.
    bool _partially_initialized;
  
    bool _thread_park_blocker;
-   bool _pending_list_uses_discovered_field;
    bool _post_vm_init_hook_enabled;
  
    bool is_valid() const {
      return (_major != 0 || _partially_initialized);
    }
--- 89,98 ----
*** 112,133 ****
      return _current._partially_initialized;
    }
  
    JDK_Version() : _major(0), _minor(0), _micro(0), _update(0),
                    _special(0), _build(0), _partially_initialized(false),
!                   _thread_park_blocker(false), _post_vm_init_hook_enabled(false),
!                   _pending_list_uses_discovered_field(false) {}
  
    JDK_Version(uint8_t major, uint8_t minor = 0, uint8_t micro = 0,
                uint8_t update = 0, uint8_t special = 0, uint8_t build = 0,
!               bool thread_park_blocker = false, bool post_vm_init_hook_enabled = false,
!               bool pending_list_uses_discovered_field = false) :
        _major(major), _minor(minor), _micro(micro), _update(update),
        _special(special), _build(build), _partially_initialized(false),
        _thread_park_blocker(thread_park_blocker),
!       _post_vm_init_hook_enabled(post_vm_init_hook_enabled),
!       _pending_list_uses_discovered_field(pending_list_uses_discovered_field) {}
  
    // Returns the current running JDK version
    static JDK_Version current() { return _current; }
  
    // Factory methods for convenience
--- 111,131 ----
      return _current._partially_initialized;
    }
  
    JDK_Version() : _major(0), _minor(0), _micro(0), _update(0),
                    _special(0), _build(0), _partially_initialized(false),
!                   _thread_park_blocker(false), _post_vm_init_hook_enabled(false)
!                   {}
  
    JDK_Version(uint8_t major, uint8_t minor = 0, uint8_t micro = 0,
                uint8_t update = 0, uint8_t special = 0, uint8_t build = 0,
!               bool thread_park_blocker = false, bool post_vm_init_hook_enabled = false) :
        _major(major), _minor(minor), _micro(micro), _update(update),
        _special(special), _build(build), _partially_initialized(false),
        _thread_park_blocker(thread_park_blocker),
!       _post_vm_init_hook_enabled(post_vm_init_hook_enabled)
!       {}
  
    // Returns the current running JDK version
    static JDK_Version current() { return _current; }
  
    // Factory methods for convenience
*** 150,163 ****
      return _thread_park_blocker;
    }
    bool post_vm_init_hook_enabled() const {
      return _post_vm_init_hook_enabled;
    }
-   // For compatibility wrt pre-4965777 JDK's
-   bool pending_list_uses_discovered_field() const {
-     return _pending_list_uses_discovered_field;
-   }
  
    // Performs a full ordering comparison using all fields (update, build, etc.)
    int compare(const JDK_Version& other) const;
  
    /**
--- 148,157 ----