diff options
| author |  Dmitry Lomov <dslomov@google.com> | 2015-11-19 15:14:15 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-11-19 16:47:58 +0000 |
| commit | 8b1a0947bfd9a059a886c4cc45242ddc2ccec003 (patch) | |
| tree | 00e5d0ed814126693ac18bf0a11c125342568a94 /src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java | |
| parent | d30ae4daafba3d1aad7dd15f988116ecf43a2d7f (diff) | |
Workaround javac 1.7 bug
--
MOS_MIGRATED_REVID=108243881
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java index 00cb6f694b..4478e72548 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationCollection.java @@ -167,7 +167,11 @@ public final class BuildConfigurationCollection { ListMultimap<? extends SplitTransition<?>, BuildConfiguration> splitTransitionTable) { this.configuration = configuration; this.transitionTable = ImmutableMap.copyOf(transitionTable); - this.splitTransitionTable = ImmutableListMultimap.copyOf(splitTransitionTable); + // Do not remove <SplitTransition<?>, BuildConfiguration>: + // workaround for Java 7 type inference. + this.splitTransitionTable = + ImmutableListMultimap.<SplitTransition<?>, BuildConfiguration>copyOf( + splitTransitionTable); } public Map<? extends Transition, ConfigurationHolder> getTransitionTable() { |