diff -r 1fca55136d66 -r 1068dcb8d315 hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp
--- a/hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp	Thu Jan 07 14:55:12 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/blockOffsetTable.hpp	Thu Jan 07 16:25:53 2016 +0100
@@ -248,7 +248,7 @@
 //////////////////////////////////////////////////////////////////////////
 class BlockOffsetArray: public BlockOffsetTable {
   friend class VMStructs;
-  friend class G1BlockOffsetArray; // temp. until we restructure and cleanup
+  friend class G1BlockOffsetTablePart; // temp. until we restructure and cleanup
  protected:
   // The following enums are used by do_block_internal() below
   enum Action {