--- old/src/share/vm/gc/g1/ptrQueue.hpp	2016-02-19 10:53:36.033304850 -0500
+++ new/src/share/vm/gc/g1/ptrQueue.hpp	2016-02-19 10:53:35.549277633 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -216,8 +216,8 @@
   Monitor* _cbl_mon;  // Protects the fields below.
   BufferNode* _completed_buffers_head;
   BufferNode* _completed_buffers_tail;
-  int _n_completed_buffers;
-  int _process_completed_threshold;
+  size_t _n_completed_buffers;
+  size_t _process_completed_threshold;
   volatile bool _process_completed;
 
   // This (and the interpretation of the first element as a "next"
@@ -239,10 +239,10 @@
 
   // Maximum number of elements allowed on completed queue: after that,
   // enqueuer does the work itself.  Zero indicates no maximum.
-  int _max_completed_queue;
-  int _completed_queue_padding;
+  size_t _max_completed_queue;
+  size_t _completed_queue_padding;
 
-  int completed_buffers_list_length();
+  size_t completed_buffers_list_length();
   void assert_completed_buffer_list_len_correct_locked();
   void assert_completed_buffer_list_len_correct();
 
@@ -263,8 +263,8 @@
   // arguments.
   void initialize(Monitor* cbl_mon,
                   Mutex* fl_lock,
-                  int process_completed_threshold,
-                  int max_completed_queue,
+                  size_t process_completed_threshold,
+                  size_t max_completed_queue,
                   PtrQueueSet *fl_owner = NULL);
 
 public:
@@ -299,22 +299,22 @@
   size_t buffer_size() { return _sz; }
 
   // Get/Set the number of completed buffers that triggers log processing.
-  void set_process_completed_threshold(int sz) { _process_completed_threshold = sz; }
-  int process_completed_threshold() const { return _process_completed_threshold; }
+  void set_process_completed_threshold(size_t sz) { _process_completed_threshold = sz; }
+  size_t process_completed_threshold() const { return _process_completed_threshold; }
 
   // Must only be called at a safe point.  Indicates that the buffer free
   // list size may be reduced, if that is deemed desirable.
   void reduce_free_list();
 
-  int completed_buffers_num() { return _n_completed_buffers; }
+  size_t completed_buffers_num() { return _n_completed_buffers; }
 
   void merge_bufferlists(PtrQueueSet* src);
 
-  void set_max_completed_queue(int m) { _max_completed_queue = m; }
-  int max_completed_queue() { return _max_completed_queue; }
+  void set_max_completed_queue(size_t m) { _max_completed_queue = m; }
+  size_t max_completed_queue() { return _max_completed_queue; }
 
-  void set_completed_queue_padding(int padding) { _completed_queue_padding = padding; }
-  int completed_queue_padding() { return _completed_queue_padding; }
+  void set_completed_queue_padding(size_t padding) { _completed_queue_padding = padding; }
+  size_t completed_queue_padding() { return _completed_queue_padding; }
 
   // Notify the consumer if the number of buffers crossed the threshold
   void notify_if_necessary();