So many changes. Broken.

[invirt/third/libt4.git] / include / rpc / marshall_wrap.h

diff --git a/rpc/marshall_wrap.h b/include/rpc/marshall_wrap.h
similarity index 97%
rename from rpc/marshall_wrap.h
rename to include/rpc/marshall_wrap.h
index 04f5268..497c882 100644 (file)
--- a/rpc/marshall_wrap.h
+++ b/include/rpc/marshall_wrap.h
@@ -1,7 +1,7 @@
 #ifndef marshall_wrap_h
 #define marshall_wrap_h
 
-#include "marshall.h"
+#include "include/rpc/marshall.h"
 
 typedef std::function<rpc_protocol::status(unmarshall &&, marshall &)> handler;
 
@@ -73,7 +73,7 @@ struct marshalled_func_imp<F, C, RV(R &, Args...), ErrorHandler> {
         return new handler([=](unmarshall && u, marshall & m) -> RV {
             // Unmarshall each argument with the correct type and store the
             // result in a tuple.
-            ArgsStorage t{u._grab<typename std::decay<Args>::type>()...};
+            ArgsStorage t{u.get<typename std::decay<Args>::type>()...};
             // Verify successful unmarshalling of the entire input stream.
             if (!u.okdone())
                 return (RV)ErrorHandler::unmarshall_args_failure();