diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
| commit | a127aae2a5fbae146ea81e470541209436222970 (patch) | |
| tree | 75b8a7d3362896fd6562eac321b239326296b48a /test/files/scalap/typeAnnotations | |
| parent | 0c9ffe55c774de261d32f36cc29b954638e86574 (diff) | |
| parent | 5b562d4e7e451156236b48b3591db980a5691f8d (diff) | |
| download | scala-a127aae2a5fbae146ea81e470541209436222970.tar.gz scala-a127aae2a5fbae146ea81e470541209436222970.tar.bz2 scala-a127aae2a5fbae146ea81e470541209436222970.zip | |
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Diffstat (limited to 'test/files/scalap/typeAnnotations')
| -rw-r--r-- | test/files/scalap/typeAnnotations/result.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/scalap/typeAnnotations/result.test b/test/files/scalap/typeAnnotations/result.test index b565d6185b..fe48e081d3 100644 --- a/test/files/scalap/typeAnnotations/result.test +++ b/test/files/scalap/typeAnnotations/result.test @@ -1,4 +1,4 @@ -abstract class TypeAnnotations[@scala.specialized R] extends java.lang.Object with scala.ScalaObject { +abstract class TypeAnnotations[@scala.specialized R] extends java.lang.Object with scala.AnyRef { def this() = { /* compiled code */ } @scala.specialized val x : scala.Int = { /* compiled code */ } |