--- old/src/share/vm/gc_implementation/g1/g1Allocator.cpp	2014-12-15 13:00:08.896458036 +0100
+++ new/src/share/vm/gc_implementation/g1/g1Allocator.cpp	2014-12-15 13:00:08.836456237 +0100
@@ -113,7 +113,7 @@
 G1ParGCAllocBuffer::G1ParGCAllocBuffer(size_t gclab_word_size) :
   ParGCAllocBuffer(gclab_word_size), _retired(true) { }
 
-HeapWord* G1ParGCAllocator::allocate_direct_or_new_plab(in_cset_state_t dest,
+HeapWord* G1ParGCAllocator::allocate_direct_or_new_plab(InCSetState dest,
                                                         size_t word_sz,
                                                         AllocationContext_t context) {
   size_t gclab_word_size = _g1h->desired_plab_sz(dest);
@@ -142,15 +142,15 @@
   G1ParGCAllocator(g1h),
   _surviving_alloc_buffer(g1h->desired_plab_sz(InCSetState::Young)),
   _tenured_alloc_buffer(g1h->desired_plab_sz(InCSetState::Old)) {
-  for (uint i = 0; i < InCSetState::Num; i += 1) {
-    _alloc_buffers[i] = NULL;
+  for (uint state = 0; state < InCSetState::Num; state++) {
+    _alloc_buffers[state] = NULL;
   }
   _alloc_buffers[InCSetState::Young] = &_surviving_alloc_buffer;
   _alloc_buffers[InCSetState::Old]  = &_tenured_alloc_buffer;
 }
 
 void G1DefaultParGCAllocator::retire_alloc_buffers() {
-  for (uint state = 0; state < InCSetState::Num; state += 1) {
+  for (uint state = 0; state < InCSetState::Num; state++) {
     G1ParGCAllocBuffer* const buf = _alloc_buffers[state];
     if (buf != NULL) {
       add_to_alloc_buffer_waste(buf->words_remaining());