diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2010-05-10 15:36:17 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2010-05-10 15:36:17 +0000 |
| commit | f8b4ca8cf0b3957e09a21a1019152ae3d87c8a01 (patch) | |
| tree | 5af6db449ca713728d8ecdd33197ab83c384391b | |
| parent | 8fe7b531649dd5f82b6ac46720c751750e893500 (diff) | |
| download | scala-f8b4ca8cf0b3957e09a21a1019152ae3d87c8a01.tar.gz scala-f8b4ca8cf0b3957e09a21a1019152ae3d87c8a01.tar.bz2 scala-f8b4ca8cf0b3957e09a21a1019152ae3d87c8a01.zip | |
Fixed -Xcheckinit build.no review.
| -rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index 557c1516f7..300fd3b8b2 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -f090cf58e9797f7486e7b40371e9db5f7abb4ab1 ?scala-compiler.jar +003012ffac418126c8808ecefad56e9bd2f889bf ?scala-compiler.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index 299ae07601..f91699b2af 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -1ed76e39f609982b354442d5f7ccfcf376b7b396 ?scala-library.jar +d251aca11b739698c3c04319be5ad88825dc1732 ?scala-library.jar diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 85f71cabc9..18c4a74950 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -738,7 +738,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { val res = (settings.checkInit.value && sym.isGetter && !sym.isInitializedToDefault - && !sym.hasFlag(PARAMACCESSOR) + && !sym.hasFlag(PARAMACCESSOR | SPECIALIZED) && !sym.accessed.hasFlag(PRESUPER) && !sym.isOuterAccessor) |