src/share/vm/runtime/vmStructs.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 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) 2000, 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.
*** 2211,2221 ****
    declare_constant(BarrierSet::ModRef)                                    \
    declare_constant(BarrierSet::CardTableModRef)                           \
    declare_constant(BarrierSet::CardTableExtension)                        \
    declare_constant(BarrierSet::G1SATBCT)                                  \
    declare_constant(BarrierSet::G1SATBCTLogging)                           \
-   declare_constant(BarrierSet::Other)                                     \
                                                                            \
    declare_constant(BlockOffsetSharedArray::LogN)                          \
    declare_constant(BlockOffsetSharedArray::LogN_words)                    \
    declare_constant(BlockOffsetSharedArray::N_bytes)                       \
    declare_constant(BlockOffsetSharedArray::N_words)                       \
--- 2211,2220 ----