summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-28 15:34:01 -0800
committerPaul Phillips <paulp@improving.org>2012-02-28 15:34:01 -0800
commit872c825192b30faa1b20f9cc2b1e3a0adeed8617 (patch)
tree17ec63094bbf9dd56d45aee4e4add0c784ecc4c1 /src/library
parent4ab3600298de995e7de6d5cfdce73e0f278341e2 (diff)
parent01ee3de96dcae707fb8fee28e93af0515519c603 (diff)
downloadscala-872c825192b30faa1b20f9cc2b1e3a0adeed8617.tar.gz
scala-872c825192b30faa1b20f9cc2b1e3a0adeed8617.tar.bz2
scala-872c825192b30faa1b20f9cc2b1e3a0adeed8617.zip
Merge remote-tracking branch 'szabolcsberecz/SI-64' into SI-64-fresh
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/annotation/synchronized.scala15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/library/scala/annotation/synchronized.scala b/src/library/scala/annotation/synchronized.scala
new file mode 100644
index 0000000000..9470c7173c
--- /dev/null
+++ b/src/library/scala/annotation/synchronized.scala
@@ -0,0 +1,15 @@
+/* __ *\
+** ________ ___ / / ___ Scala API **
+** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL **
+** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
+** /____/\___/_/ |_/____/_/ | | **
+** |/ **
+\* */
+
+package scala.annotation
+
+/**
+ * If this annotation is present on a method, the synchronized flag will be emitted.
+ * FIXME This should be internal to the compiler
+ */
+private[scala] class synchronized extends StaticAnnotation