Repository: spark Updated Branches: refs/heads/master 96f28c972 -> caa163f08
fix compile error of streaming project explicit return type for implicit function Author: James Z.M. Gao <gao...@mediav.com> Closes #153 from gzm55/work/streaming-compile and squashes the following commits: 11e9c8d [James Z.M. Gao] fix style error fe88109 [James Z.M. Gao] fix compile error of streaming project Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/caa163f0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/caa163f0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/caa163f0 Branch: refs/heads/master Commit: caa163f0868776d91697a9041528e382a789f0c3 Parents: 96f28c9 Author: James Z.M. Gao <gao...@mediav.com> Authored: Wed Jul 16 11:35:21 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Wed Jul 16 11:35:21 2014 -0700 ---------------------------------------------------------------------- .../org/apache/spark/streaming/api/java/JavaPairDStream.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/caa163f0/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala index c4bdf01..c00e11d 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala @@ -737,7 +737,8 @@ class JavaPairDStream[K, V](val dstream: DStream[(K, V)])( } object JavaPairDStream { - implicit def fromPairDStream[K: ClassTag, V: ClassTag](dstream: DStream[(K, V)]) = { + implicit def fromPairDStream[K: ClassTag, V: ClassTag](dstream: DStream[(K, V)]) + : JavaPairDStream[K, V] = { new JavaPairDStream[K, V](dstream) }