--- old/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	2014-12-18 15:48:34.883470709 +0100
+++ new/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	2014-12-18 15:48:34.812468589 +0100
@@ -161,8 +161,8 @@
                                                       InCSetState* dest,
                                                       size_t word_sz,
                                                       AllocationContext_t const context) {
-  assert(state.is_in_cset_or_humongous(), err_msg("Unexpected state: %u", state.value()));
-  assert(dest->is_in_cset_or_humongous(), err_msg("Unexpected dest: %u", dest->value()));
+  assert(state.is_in_cset_or_humongous(), err_msg("Unexpected state: " CSETSTATE_FORMAT, state.value()));
+  assert(dest->is_in_cset_or_humongous(), err_msg("Unexpected dest: " CSETSTATE_FORMAT, dest->value()));
 
   // Right now we only have two types of regions (young / old) so
   // let's keep the logic here simple. We can generalize it when necessary.
@@ -179,7 +179,7 @@
     dest->set_old();
     return obj_ptr;
   } else {
-    assert(dest->is_old(), err_msg("Unexpected dest: %u", dest->value()));
+    assert(dest->is_old(), err_msg("Unexpected dest: " CSETSTATE_FORMAT, dest->value()));
     // no other space to try.
     return NULL;
   }