Merge pull request #13 from lihaoyi-databricks/wip0.2.3

Upstream some fixes

1 files changed, 4 insertions, 4 deletions

diff --git a/example/decorated2/app/src/Decorated2.scala b/example/decorated2/app/src/Decorated2.scala
index 20526b7..305281a 100644
--- a/example/decorated2/app/src/Decorated2.scala
+++ b/example/decorated2/app/src/Decorated2.scala
@@ -3,13 +3,13 @@ object Decorated2 extends cask.MainRoutes{
   class User{
     override def toString = "[haoyi]"
   }
-  class loggedIn extends cask.Decorator {
-    def wrapFunction(ctx: cask.Request, delegate: Delegate): Returned = {
+  class loggedIn extends cask.RawDecorator {
+    def wrapFunction(ctx: cask.Request, delegate: Delegate): OuterReturned = {
       delegate(Map("user" -> new User()))
     }
   }
-  class withExtra extends cask.Decorator {
-    def wrapFunction(ctx: cask.Request, delegate: Delegate): Returned = {
+  class withExtra extends cask.RawDecorator {
+    def wrapFunction(ctx: cask.Request, delegate: Delegate): OuterReturned = {
       delegate(Map("extra" -> 31337))
     }
   }