diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-22 10:40:23 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-22 10:40:23 -0700 |
| commit | 8a6a3b99a56f4ae53cbc7036615e8a78aa57d5e9 (patch) | |
| tree | 7ba24515c3cbb660c9d60d104869bd2b26528562 | |
| parent | 3cdbcf0c8610c564ea50ed6cf9e82d35c5750ce9 (diff) | |
| parent | 05cd9ee2b402f91abb1fd8af70ebab102ab4e313 (diff) | |
| download | scala-8a6a3b99a56f4ae53cbc7036615e8a78aa57d5e9.tar.gz scala-8a6a3b99a56f4ae53cbc7036615e8a78aa57d5e9.tar.bz2 scala-8a6a3b99a56f4ae53cbc7036615e8a78aa57d5e9.zip | |
Merge pull request #1379 from retronym/topic/boxing-conversions
Remove BoxingConversions from the scala package.
| -rw-r--r-- | src/library/scala/BoxingConversions.scala | 5 | ||||
| -rw-r--r-- | test/files/run/Meter.scala | 5 | ||||
| -rw-r--r-- | test/files/run/MeterCaseClass.scala | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/library/scala/BoxingConversions.scala b/src/library/scala/BoxingConversions.scala deleted file mode 100644 index fd1bd6c121..0000000000 --- a/src/library/scala/BoxingConversions.scala +++ /dev/null @@ -1,5 +0,0 @@ -package scala -abstract class BoxingConversions[Boxed, Unboxed] { - def box(x: Unboxed): Boxed - def unbox(x: Boxed): Unboxed -} diff --git a/test/files/run/Meter.scala b/test/files/run/Meter.scala index a0c04cc2a7..a10ad31b4a 100644 --- a/test/files/run/Meter.scala +++ b/test/files/run/Meter.scala @@ -1,4 +1,9 @@ package a { + abstract class BoxingConversions[Boxed, Unboxed] { + def box(x: Unboxed): Boxed + def unbox(x: Boxed): Unboxed + } + class Meter(val underlying: Double) extends AnyVal with _root_.b.Printable { def + (other: Meter): Meter = new Meter(this.underlying + other.underlying) diff --git a/test/files/run/MeterCaseClass.scala b/test/files/run/MeterCaseClass.scala index 18f8e23f89..39d95c2af5 100644 --- a/test/files/run/MeterCaseClass.scala +++ b/test/files/run/MeterCaseClass.scala @@ -1,4 +1,9 @@ package a { + abstract class BoxingConversions[Boxed, Unboxed] { + def box(x: Unboxed): Boxed + def unbox(x: Boxed): Unboxed + } + case class Meter(underlying: Double) extends AnyVal with _root_.b.Printable { def + (other: Meter): Meter = new Meter(this.underlying + other.underlying) |