1.1 --- a/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -80,7 +80,7 @@
1.11 virtual void set_bottom(HeapWord* new_bottom) {
1.12 assert(new_bottom <= _end,
1.13 err_msg("new_bottom (" PTR_FORMAT ") > _end (" PTR_FORMAT ")",
1.14 - new_bottom, _end));
1.15 + p2i(new_bottom), p2i(_end)));
1.16 _bottom = new_bottom;
1.17 resize(pointer_delta(_end, _bottom));
1.18 }
1.19 @@ -146,7 +146,7 @@
1.20 void check_offset(size_t offset, const char* msg) const {
1.21 assert(offset <= N_words,
1.22 err_msg("%s - "
1.23 - "offset: " UINT32_FORMAT", N_words: " UINT32_FORMAT,
1.24 + "offset: " SIZE_FORMAT ", N_words: " UINT32_FORMAT,
1.25 msg, offset, N_words));
1.26 }
1.27
