ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/PriorityQueue.java

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.107 by jsr166, Sun Sep 20 16:20:21 2015 UTC vs.
Revision 1.110 by jsr166, Wed Aug 24 21:46:18 2016 UTC

#	Line 337 | Line 337 | public class PriorityQueue<E> extends Ab
337		int i = size;
338		if (i >= queue.length)
339		grow(i + 1);
340	+	siftUp(i, e);
341		size = i + 1;
341	–	if (i == 0)
342	–	queue[0] = e;
343	–	else
344	–	siftUp(i, e);
342		return true;
343		}
344
#	Line 752 | Line 749 | public class PriorityQueue<E> extends Ab
749		/**
750		* Saves this queue to a stream (that is, serializes it).
751		*
752	+	* @param s the stream
753	+	* @throws java.io.IOException if an I/O error occurs
754		* @serialData The length of the array backing the instance is
755		*             emitted (int), followed by all of its elements
756		*             (each an {@code Object}) in the proper order.
758	–	* @param s the stream
759	–	* @throws java.io.IOException if an I/O error occurs
757		*/
758		private void writeObject(java.io.ObjectOutputStream s)
759		throws java.io.IOException {
#	Line 826 | Line 823 | public class PriorityQueue<E> extends Ab
823		private int fence;            // -1 until first use
824		private int expectedModCount; // initialized when fence set
825
826	<	/** Creates new spliterator covering the given range */
826	>	/** Creates new spliterator covering the given range. */
827		PriorityQueueSpliterator(PriorityQueue<E> pq, int origin, int fence,
828		int expectedModCount) {
829		this.pq = pq;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines