diff options
author | Paul Phillips <paulp@improving.org> | 2011-05-01 19:58:44 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-05-01 19:58:44 +0000 |
commit | 70f18a67e5cc55e534a504b71ee26a93488b40f8 (patch) | |
tree | 867125fa846a4267ca408a74c0149305b057b013 /src | |
parent | f82acf5d370111cb96f39332c28177f186a88f10 (diff) | |
download | scala-70f18a67e5cc55e534a504b71ee26a93488b40f8.tar.gz scala-70f18a67e5cc55e534a504b71ee26a93488b40f8.tar.bz2 scala-70f18a67e5cc55e534a504b71ee26a93488b40f8.zip |
Added a @bridge'd $scope back to scala package ...
Added a @bridge'd $scope back to scala package object for binary compat.
No review.
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/package.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/library/scala/package.scala b/src/library/scala/package.scala index 5c9f9b7dd8..264fd18406 100644 --- a/src/library/scala/package.scala +++ b/src/library/scala/package.scala @@ -6,7 +6,7 @@ ** |/ ** \* */ - +import annotation.bridge /** * Core Scala types. They are always available without an explicit import. @@ -75,6 +75,11 @@ package object scala { @deprecated("Use Thread.currentThread instead", "2.9.0") def currentThread = java.lang.Thread.currentThread() + // Moved back into Predef to avoid unnecessary indirection by + // way of the scala package object within the standard library, + // but bridged for compatibility. + @bridge def $scope = scala.xml.TopScope + // Numeric types which were moved into scala.math.* type BigDecimal = scala.math.BigDecimal |