From 70f18a67e5cc55e534a504b71ee26a93488b40f8 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sun, 1 May 2011 19:58:44 +0000 Subject: Added a @bridge'd $scope back to scala package ... Added a @bridge'd $scope back to scala package object for binary compat. No review. --- src/library/scala/package.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3