diff options
| -rw-r--r-- | src/library/scala/BigDecimal.scala | 15 | ||||
| -rw-r--r-- | test/files/jvm/bigints.scala | 6 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/library/scala/BigDecimal.scala b/src/library/scala/BigDecimal.scala index 31413f5b1c..15ebaea617 100644 --- a/src/library/scala/BigDecimal.scala +++ b/src/library/scala/BigDecimal.scala @@ -142,23 +142,8 @@ object BigDecimal /** Implicit conversion from <code>Long</code> to <code>BigDecimal</code>. */ implicit def long2bigDecimal(l: Long): BigDecimal = apply(l) - /** Implicit conversion from <code>Float</code> to <code>BigDecimal</code>. - * @since 2.8 - */ - implicit def float2bigDecimal(f: Float): BigDecimal = apply(f) - /** Implicit conversion from <code>Double</code> to <code>BigDecimal</code>. */ implicit def double2bigDecimal(d: Double): BigDecimal = apply(d) - - /** Implicit conversion from <code>String</code> to <code>BigDecimal</code>. - * @since 2.8 - */ - implicit def string2bigDecimal(s: String): BigDecimal = apply(s) - - /** Implicit conversion from <code>BigInt</code> to <code>BigDecimal</code>. - * @since 2.8 - */ - implicit def bigInt2bigDecimal(x: BigInt): BigDecimal = apply(x) } /** diff --git a/test/files/jvm/bigints.scala b/test/files/jvm/bigints.scala index 0342c3007e..f4ca2d17a3 100644 --- a/test/files/jvm/bigints.scala +++ b/test/files/jvm/bigints.scala @@ -40,9 +40,9 @@ object Test_BigDecimal extends TestCase("BigDecimal") with Assert { val xi: BigDecimal = 1 val xd: BigDecimal = 1.0 - val xf: BigDecimal = 1.0f - val xs: BigDecimal = "1.0" - val xbi: BigDecimal = scala.BigInt(1) + val xf: BigDecimal = BigDecimal(1.0f) + val xs: BigDecimal = BigDecimal("1.0") + val xbi: BigDecimal = BigDecimal(scala.BigInt(1)) val x: BigDecimal = 1 val y = x + 1 |