1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2013, 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 @@ -61,7 +61,7 @@
1.11 (_hr_)->startsHumongous() ? "HS" : \
1.12 (_hr_)->continuesHumongous() ? "HC" : \
1.13 !(_hr_)->is_empty() ? "O" : "F", \
1.14 - (_hr_)->bottom(), (_hr_)->top(), (_hr_)->end()
1.15 + p2i((_hr_)->bottom()), p2i((_hr_)->top()), p2i((_hr_)->end())
1.16
1.17 // sentinel value for hrs_index
1.18 #define G1_NULL_HRS_INDEX ((uint) -1)
1.19 @@ -550,7 +550,7 @@
1.20 (containing_set != NULL && _containing_set == NULL),
1.21 err_msg("containing_set: "PTR_FORMAT" "
1.22 "_containing_set: "PTR_FORMAT,
1.23 - containing_set, _containing_set));
1.24 + p2i(containing_set), p2i(_containing_set)));
1.25
1.26 _containing_set = containing_set;
1.27 }
