aboutsummaryrefslogtreecommitdiff
path: root/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java
diff options
context:
space:
mode:
Diffstat (limited to 'android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java')
-rw-r--r--android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java b/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java
index 9d4e65ae9..639775c5b 100644
--- a/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java
+++ b/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java
@@ -41,7 +41,6 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.PriorityQueue;
import java.util.Queue;
-import org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl;
import org.checkerframework.checker.nullness.compatqual.NullableDecl;
/**
@@ -505,7 +504,7 @@ public final class MinMaxPriorityQueue<E> extends AbstractQueue<E> {
@WeakOuter
private class Heap {
final Ordering<E> ordering;
- @MonotonicNonNullDecl @Weak Heap otherHeap;
+ @Weak @NullableDecl Heap otherHeap;
Heap(Ordering<E> ordering) {
this.ordering = ordering;
@@ -752,8 +751,8 @@ public final class MinMaxPriorityQueue<E> extends AbstractQueue<E> {
private int expectedModCount = modCount;
// The same element is not allowed in both forgetMeNot and skipMe, but duplicates are allowed in
// either of them, up to the same multiplicity as the queue.
- @MonotonicNonNullDecl private Queue<E> forgetMeNot;
- @MonotonicNonNullDecl private List<E> skipMe;
+ @NullableDecl private Queue<E> forgetMeNot;
+ @NullableDecl private List<E> skipMe;
@NullableDecl private E lastFromForgetMeNot;
private boolean canRemove;