summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-05 22:58:46 -0700
committerPaul Phillips <paulp@improving.org>2012-04-05 22:58:46 -0700
commitea39db73654d46c6383ea1c4b4b2b16a45ac14d8 (patch)
treeeae1d3e89f5d8903da6437a8fa14325638d591b8 /src/library
parent9ccfce6bbc750dd03c11b0694a3cdc8ad51d7288 (diff)
parent94b3dc83c44ed843a3aae67abf2b877669e63fe0 (diff)
downloadscala-ea39db73654d46c6383ea1c4b4b2b16a45ac14d8.tar.gz
scala-ea39db73654d46c6383ea1c4b4b2b16a45ac14d8.tar.bz2
scala-ea39db73654d46c6383ea1c4b4b2b16a45ac14d8.zip
Merge commit 'refs/pull/355/head^'
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/reflect/api/Positions.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/reflect/api/Positions.scala b/src/library/scala/reflect/api/Positions.scala
index 4c8c33bec8..91f1081b4d 100644
--- a/src/library/scala/reflect/api/Positions.scala
+++ b/src/library/scala/reflect/api/Positions.scala
@@ -11,7 +11,7 @@ trait Positions { self: Universe =>
* Typically, positionToAnnotation is the identity, and annotationToPosition returns annot.pos
*/
type TreeAnnotation // <: { def pos: Position }
- val NoTreeAnnotation: TreeAnnotation
+ def NoTreeAnnotation: TreeAnnotation
implicit def positionToAnnotation(pos: Position): TreeAnnotation // = pos
def annotationToPosition(annot: TreeAnnotation): Position // = annot.pos
def _checkSetAnnotation(tree: Tree, annot: TreeAnnotation): Unit = () // check that annot may overwrite tree.annot