--- a/hotspot/src/share/vm/runtime/arguments.cpp Fri May 09 08:34:22 2014 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Fri May 09 16:50:54 2014 -0400
@@ -852,7 +852,7 @@
for (int i=0; i < _num_jvm_flags; i++) {
st->print("%s ", _jvm_flags_array[i]);
}
- st->print_cr("");
+ st->cr();
}
}
@@ -861,7 +861,7 @@
for (int i=0; i < _num_jvm_args; i++) {
st->print("%s ", _jvm_args_array[i]);
}
- st->print_cr("");
+ st->cr();
}
}
@@ -1349,8 +1349,8 @@
}
if (PrintGCDetails && Verbose) {
tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk",
- MarkStackSize / K, MarkStackSizeMax / K);
- tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
+ (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
+ tty->print_cr("ConcGCThreads: %u", (uint) ConcGCThreads);
}
}
#endif // INCLUDE_ALL_GCS
@@ -1430,7 +1430,7 @@
if (PrintGCDetails) {
// Cannot use gclog_or_tty yet.
tty->print_cr("Automatic selection of the low pause collector"
- " based on pause goal of %d (ms)", MaxGCPauseMillis);
+ " based on pause goal of %d (ms)", (int) MaxGCPauseMillis);
}
return true;
}
@@ -1647,8 +1647,8 @@
if (PrintGCDetails && Verbose) {
tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk",
- MarkStackSize / K, MarkStackSizeMax / K);
- tty->print_cr("ConcGCThreads: %u", ConcGCThreads);
+ (unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
+ tty->print_cr("ConcGCThreads: %u", (uint) ConcGCThreads);
}
}
@@ -1732,7 +1732,7 @@
if (PrintGCDetails && Verbose) {
// Cannot use gclog_or_tty yet.
- tty->print_cr(" Maximum heap size " SIZE_FORMAT, reasonable_max);
+ tty->print_cr(" Maximum heap size " SIZE_FORMAT, (size_t) reasonable_max);
}
FLAG_SET_ERGO(uintx, MaxHeapSize, (uintx)reasonable_max);
}
@@ -2105,7 +2105,7 @@
// Using "else if" below to avoid printing two error messages if min > max.
// This will also prevent us from reporting both min>100 and max>100 at the
// same time, but that is less annoying than printing two identical errors IMHO.
- FormatBuffer<80> err_msg("");
+ FormatBuffer<80> err_msg("%s","");
if (!verify_MinHeapFreeRatio(err_msg, MinHeapFreeRatio)) {
jio_fprintf(defaultStream::error_stream(), "%s\n", err_msg.buffer());
status = false;