diff options
author | kevinw <none@none> | 2018-06-27 03:04:33 -0700 |
---|---|---|
committer | kevinw <none@none> | 2018-06-27 03:04:33 -0700 |
commit | ad7263c1491efd5b59b83851e9ebc5806905f688 (patch) | |
tree | 1bec86d4d3e292cef21c144778e4eaa87cd118a4 /src/share/vm/gc_implementation/g1 | |
parent | 13e491e728c192adcc12bf54ab84e6bf536a4205 (diff) | |
download | jdk8u_hotspot-ad7263c1491efd5b59b83851e9ebc5806905f688.tar.gz |
8204872: [8u] VS2017: more instances of "error C3680: cannot concatenate user-defined string literals with mismatched literal suffix identifiers"
Reviewed-by: dholmes
Diffstat (limited to 'src/share/vm/gc_implementation/g1')
-rw-r--r-- | src/share/vm/gc_implementation/g1/concurrentMark.cpp | 6 | ||||
-rw-r--r-- | src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp index d1f1fa1bc..ea0e564b7 100644 --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp @@ -2846,7 +2846,7 @@ public: } } - _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s", + _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s", p2i(p), p2i((void*) obj), str, str2); } }; @@ -2873,7 +2873,7 @@ public: bool print_it = _all || over_tams || marked; if (print_it) { - _out->print_cr(" "PTR_FORMAT"%s", + _out->print_cr(" " PTR_FORMAT "%s", p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : ""); PrintReachableOopClosure oopCl(_out, _vo, _all); o->oop_iterate_no_header(&oopCl); @@ -2894,7 +2894,7 @@ public: HeapWord* e = hr->end(); HeapWord* t = hr->top(); HeapWord* p = _g1h->top_at_mark_start(hr, _vo); - _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" " + _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " " "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p)); _out->cr(); diff --git a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp index 3002e277d..c9ea429c8 100644 --- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp @@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { void FromCardCache::print(outputStream* out) { for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { for (uint j = 0; j < _max_regions; j++) { - out->print_cr("_from_card_cache["UINT32_FORMAT"]["UINT32_FORMAT"] = "INT32_FORMAT".", + out->print_cr("_from_card_cache[" UINT32_FORMAT "][" UINT32_FORMAT "] = " INT32_FORMAT ".", i, j, at(i, j)); } } @@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) { int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift); if (G1TraceHeapRegionRememberedSet) { - gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")", + gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")", hr()->bottom(), from_card, FromCardCache::at((uint)tid, cur_hrm_ind)); } |