diff options
author | Simon Ochsenreither <simon@ochsenreither.de> | 2015-11-19 21:44:13 +0100 |
---|---|---|
committer | Simon Ochsenreither <simon@ochsenreither.de> | 2015-11-19 21:44:13 +0100 |
commit | e01f2a1c6524f29e6f4b4d6a977f36c6c0fa2759 (patch) | |
tree | 41f3482a91ba3669f19fe309e07c0800dd6ec71b /src/library | |
parent | d3667465f42590e4d39cef557f48d0cd050dec42 (diff) | |
download | scala-e01f2a1c6524f29e6f4b4d6a977f36c6c0fa2759.tar.gz scala-e01f2a1c6524f29e6f4b4d6a977f36c6c0fa2759.tar.bz2 scala-e01f2a1c6524f29e6f4b4d6a977f36c6c0fa2759.zip |
Fix some small warnings that pop up on every compile
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/convert/WrapAsScala.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/library/scala/collection/convert/WrapAsScala.scala b/src/library/scala/collection/convert/WrapAsScala.scala index a96cccc6ed..ee161dcc87 100644 --- a/src/library/scala/collection/convert/WrapAsScala.scala +++ b/src/library/scala/collection/convert/WrapAsScala.scala @@ -139,13 +139,13 @@ trait WrapAsScala { * If the Java `Map` was previously obtained from an implicit or * explicit call of `mapAsScalaMap(scala.collection.mutable.Map)` then * the original Scala Map will be returned. - * + * * If the wrapped map is synchronized (e.g. from `java.util.Collections.synchronizedMap`), - * it is your responsibility to wrap all + * it is your responsibility to wrap all * non-atomic operations with `underlying.synchronized`. * This includes `get`, as `java.util.Map`'s API does not allow for an * atomic `get` when `null` values may be present. - * + * * @param m The Map to be converted. * @return A Scala mutable Map view of the argument. */ @@ -170,7 +170,7 @@ trait WrapAsScala { */ implicit def mapAsScalaConcurrentMap[A, B](m: juc.ConcurrentMap[A, B]): concurrent.Map[A, B] = m match { case null => null - case cmw: ConcurrentMapWrapper[A, B] => cmw.underlying + case cmw: ConcurrentMapWrapper[_, _] => cmw.underlying case _ => new JConcurrentMapWrapper(m) } |