diff options
author | Paul Phillips <paulp@improving.org> | 2012-09-26 11:41:35 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-09-26 11:42:13 -0700 |
commit | 94ac4d5282d8bfb482f35af55e513344c24e70c1 (patch) | |
tree | 998555bbb6329496826ac89752f5651ae2ddef0f /src/library | |
parent | 052e9b17e22de317d0dc7d3a66729b825b1eb2da (diff) | |
download | scala-94ac4d5282d8bfb482f35af55e513344c24e70c1.tar.gz scala-94ac4d5282d8bfb482f35af55e513344c24e70c1.tar.bz2 scala-94ac4d5282d8bfb482f35af55e513344c24e70c1.zip |
Don't overload implicit methods.
It is the cause of much unhappiness, and it is not necessary.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/collection/convert/DecorateAsJava.scala | 4 | ||||
-rw-r--r-- | src/library/scala/collection/convert/WrapAsJava.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/collection/convert/DecorateAsJava.scala b/src/library/scala/collection/convert/DecorateAsJava.scala index e14769739d..f999d2fee8 100644 --- a/src/library/scala/collection/convert/DecorateAsJava.scala +++ b/src/library/scala/collection/convert/DecorateAsJava.scala @@ -313,6 +313,6 @@ trait DecorateAsJava { * @return An object with an `asJava` method that returns a Java * `ConcurrentMap` view of the argument. */ - implicit def asJavaConcurrentMapConverter[A, B](m: concurrent.Map[A, B]): AsJava[juc.ConcurrentMap[A, B]] = - new AsJava(asJavaConcurrentMap(m)) + implicit def mapAsJavaConcurrentMapConverter[A, B](m: concurrent.Map[A, B]): AsJava[juc.ConcurrentMap[A, B]] = + new AsJava(mapAsJavaConcurrentMap(m)) } diff --git a/src/library/scala/collection/convert/WrapAsJava.scala b/src/library/scala/collection/convert/WrapAsJava.scala index c79c651e96..e427afbb33 100644 --- a/src/library/scala/collection/convert/WrapAsJava.scala +++ b/src/library/scala/collection/convert/WrapAsJava.scala @@ -269,7 +269,7 @@ trait WrapAsJava { * @param m The Scala `concurrent.Map` to be converted. * @return A Java `ConcurrentMap` view of the argument. */ - implicit def asJavaConcurrentMap[A, B](m: concurrent.Map[A, B]): juc.ConcurrentMap[A, B] = m match { + implicit def mapAsJavaConcurrentMap[A, B](m: concurrent.Map[A, B]): juc.ConcurrentMap[A, B] = m match { case JConcurrentMapWrapper(wrapped) => wrapped case _ => new ConcurrentMapWrapper(m) } |