aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2016-04-29 16:37:44 -0700
committerIan Rogers <irogers@google.com>2016-04-29 16:37:44 -0700
commit5f3ab914effbe60066541b8e1ff9afe508d541cd (patch)
tree08f5e41a91ebcae942ee73b000aa99ec314903e7
parent2dc668f6c00d741cfc4b3778eca6953d87fe43ff (diff)
downloadguava-5f3ab914effbe60066541b8e1ff9afe508d541cd.tar.gz
Backport: Work around a type inference change in javac
https://github.com/google/guava/commit/26342f6fe1f8b629a2ce1bdb3ef872f84a7e960a Bug: 27723540 Change-Id: Ib96fcf358f6c795c96b08214be7269d41f23eb02
-rw-r--r--guava/src/com/google/common/collect/Collections2.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/guava/src/com/google/common/collect/Collections2.java b/guava/src/com/google/common/collect/Collections2.java
index a0c46b17e..9ce52497b 100644
--- a/guava/src/com/google/common/collect/Collections2.java
+++ b/guava/src/com/google/common/collect/Collections2.java
@@ -198,12 +198,12 @@ public final class Collections2 {
@Override
public boolean removeAll(final Collection<?> collection) {
- return Iterables.removeIf(unfiltered, and(predicate, in(collection)));
+ return Iterables.removeIf(unfiltered, and(predicate, Predicates.<Object>in(collection)));
}
@Override
public boolean retainAll(final Collection<?> collection) {
- return Iterables.removeIf(unfiltered, and(predicate, not(in(collection))));
+ return Iterables.removeIf(unfiltered, and(predicate, not(Predicates.<Object>in(collection))));
}
@Override