aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Ulf Adams <ulfjack@google.com>2015-10-19 10:37:42 +0000
committerGravatar Lukacs Berki <lberki@google.com>2015-10-19 13:43:36 +0000
commit8cef2f921ce51bb8a166bf3591ce0e6318a8871e (patch)
tree2fa503f340ab7ccb601b30bea6f2bf755348878b /src
parenta020102b64e63bd0c13548219f8214ba17b96703 (diff)
Fix two uses of generics that are causing errors in Eclipse for me.
-- MOS_MIGRATED_REVID=105742091
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java3
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
index 0e8f46a67b..edbd10b549 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
@@ -157,7 +157,8 @@ public class FileFunction implements SkyFunction {
realRootedPath = RootedPath.toRootedPath(parentRealRootedPath.getRoot(),
parentRealRootedPath.getRelativePath().getRelative(baseName));
if (!parentFileValue.exists()) {
- return Pair.of(realRootedPath, FileStateValue.NONEXISTENT_FILE_STATE_NODE);
+ return Pair.<RootedPath, FileStateValue>of(
+ realRootedPath, FileStateValue.NONEXISTENT_FILE_STATE_NODE);
}
}
FileStateValue realFileStateValue =
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
index 8dbeb8f450..e69de7274e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java
@@ -292,7 +292,7 @@ public final class RecursiveFilesystemTraversalValue implements SkyValue {
private static final class Directory extends ResolvedFile {
Directory(RootedPath path) {
- super(FileType.DIRECTORY, Optional.of(path), Optional.of(
+ super(FileType.DIRECTORY, Optional.of(path), Optional.<FileStateValue>of(
FileStateValue.DIRECTORY_FILE_STATE_NODE));
}