diff options
| author | Conley Owens <cco3@android.com> | 2012-09-06 10:20:14 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-06 10:20:14 -0700 |
| commit | 82ecaa2d738f24551282d93a51ce081a802c6b6e (patch) | |
| tree | 1d5e66c80191e435980025bc70449be673f0aee7 | |
| parent | adee4a2c97a40a92d5b65962d73321e3da4e2679 (diff) | |
| parent | f2dad045ddc6d368488424d240e6fb9071bcd92e (diff) | |
| download | guava-82ecaa2d738f24551282d93a51ce081a802c6b6e.tar.gz | |
Merge "Add Ubuntu patch to work around OpenJDK bug"
| -rw-r--r-- | guava/src/com/google/common/collect/Maps.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java index 2aea6b720..703c4471b 100644 --- a/guava/src/com/google/common/collect/Maps.java +++ b/guava/src/com/google/common/collect/Maps.java @@ -225,8 +225,8 @@ public final class Maps { * @param comparator the comparator to sort the keys with * @return a new, empty {@code TreeMap} */ - public static <C, K extends C, V> TreeMap<K, V> newTreeMap( - @Nullable Comparator<C> comparator) { + public static <K, V> TreeMap<K, V> newTreeMap( + @Nullable Comparator<? super K> comparator) { // Ideally, the extra type parameter "C" shouldn't be necessary. It is a // work-around of a compiler type inference quirk that prevents the // following code from being compiled: |