comparison src/share/vm/utilities/ostream.cpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents c38f13903fdf c3e799c37717
children 3ac7d10a6572
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
760 // got the lock 760 // got the lock
761 if (writer_id != _last_writer) { 761 if (writer_id != _last_writer) {
762 if (has_log) { 762 if (has_log) {
763 _log_file->bol(); 763 _log_file->bol();
764 // output a hint where this output is coming from: 764 // output a hint where this output is coming from:
765 _log_file->print_cr("<writer thread='"INTX_FORMAT"'/>", writer_id); 765 _log_file->print_cr("<writer thread='" UINTX_FORMAT "'/>", writer_id);
766 } 766 }
767 _last_writer = writer_id; 767 _last_writer = writer_id;
768 } 768 }
769 _writer = writer_id; 769 _writer = writer_id;
770 return writer_id; 770 return writer_id;