Skip to content
This repository
Browse code

Move to Scala 2.10.0-M6

  • Loading branch information...
commit f6ac81ffc56f0d7abfde7dd5ab8a067182218328 2 parents c17ae80 + f672177
Stefan Zeiger authored July 27, 2012
6  build.sbt
@@ -8,11 +8,13 @@ version := "0.11.0-SNAPSHOT"
8 8
 
9 9
 //scalaVersion := "2.10.0-unknown-unknown"
10 10
 //scalaVersion := "2.10.0-SNAPSHOT"
11  
-scalaVersion := "2.10.0-M5"
  11
+scalaVersion := "2.10.0-M6"
  12
+
  13
+scalaBinaryVersion in Global := "2.10.0-M6"
12 14
 
13 15
 resolvers += Resolver.sonatypeRepo("snapshots")
14 16
 
15  
-crossScalaVersions ++= "2.10.0-M4" :: Nil
  17
+//crossScalaVersions ++= "2.10.0-M4" :: Nil
16 18
 //crossVersion := CrossVersion.Disabled
17 19
 
18 20
 //scalaHome := Some(file("C:/Users/szeiger/code/scala/build/pack"))
4  src/main/scala/scala/slick/queryable/ImplicitQueryable.scala
@@ -27,7 +27,7 @@ object ImplicitQueryableMacros{
27 27
     val backend = c.Expr[SlickBackend]( Select( c.prefix.tree, newTermName("backend") ) )
28 28
     val session = c.Expr[Session]( Select( c.prefix.tree, newTermName("session") ) )
29 29
 
30  
-    c.reify{
  30
+    reify{
31 31
       implicit val _session = session.splice
32 32
       backend.splice.result( queryable.splice )
33 33
     }
@@ -39,7 +39,7 @@ object ImplicitQueryableMacros{
39 39
     val backend = c.Expr[SlickBackend]( Select( c.prefix.tree, newTermName("backend") ) )
40 40
     val session = c.Expr[Session]( Select( c.prefix.tree, newTermName("session") ) )
41 41
   
42  
-    c.reify{
  42
+    reify{
43 43
       implicit val _session = session.splice
44 44
       ImplicitQueryable( queryable.splice, backend.splice )
45 45
     }
4  src/main/scala/scala/slick/queryable/Queryable.scala
@@ -50,7 +50,7 @@ object QueryableMacros{
50 50
         Utils[c.type](c).removeDoubleReify(
51 51
           Select(c.prefix.tree, newTermName( "_"+name+"_placeholder" ))
52 52
       ).asInstanceOf[Tree])))
53  
-    c.reify{ new QueryableValue( reifiedExpression.splice ) } //new QueryableValue( reifiedExpression.splice )}
  53
+    reify{ new QueryableValue( reifiedExpression.splice ) } //new QueryableValue( reifiedExpression.splice )}
54 54
   }
55 55
   def length
56 56
       (c: scala.reflect.makro.Context)
@@ -65,7 +65,7 @@ object QueryableMacros{
65 65
           Apply(Select(c.prefix.tree, newTermName( "_"+name+"_placeholder" )), List( projection.tree ))
66 66
         ).asInstanceOf[Tree]
67 67
       )))
68  
-    c.reify{ Queryable.factory[S]( reifiedExpression.splice )}
  68
+    reify{ Queryable.factory[S]( reifiedExpression.splice )}
69 69
   }
70 70
 
71 71
   def map[T:c.TypeTag, S:c.TypeTag]

0 notes on commit f6ac81f

Please sign in to comment.
Something went wrong with that request. Please try again.