changeset 6488:68e6defdb086

8043723: max_heap_for_compressed_oops() declared with size_t, but defined with uintx Summary: The mismatch in declaration and definition has been encountered when compiling on a platform where the sizes are different. Change the method definition to match the declaration. Reviewed-by: tschatzl, sjohanss Contributed-by: Dan Horak <dhorak@redhat.com>
author tschatzl
date Mon, 26 May 2014 09:31:43 +0200
parents 170f6d733d7a
children abd312cd8cc2
files src/share/vm/runtime/arguments.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Fri May 23 10:28:09 2014 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Mon May 26 09:31:43 2014 +0200
@@ -1449,7 +1449,7 @@
   return true;
 }
 
-uintx Arguments::max_heap_for_compressed_oops() {
+size_t Arguments::max_heap_for_compressed_oops() {
   // Avoid sign flip.
   assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size");
   // We need to fit both the NULL page and the heap into the memory budget, while