Simplifications and clean-ups

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

diff --git a/rpc/marshall_wrap.h b/rpc/marshall_wrap.h
index 8e10a75..b895696 100644 (file)
--- a/rpc/marshall_wrap.h
+++ b/rpc/marshall_wrap.h
@@ -3,7 +3,7 @@
 
 #include "marshall.h"
 
 
 #include "marshall.h"
 

-typedef function<int(unmarshall &, marshall &)> handler;
+typedef std::function<rpc_protocol::status(unmarshall &&, marshall &)> handler;

 
 //
 // Automatic marshalling wrappers for RPC handlers
 
 //
 // Automatic marshalling wrappers for RPC handlers

@@ -43,17 +43,17 @@ struct VerifyOnFailure {
 // One for function pointers...
 
 template <class F, class R, class RV, class args_type, size_t... Indices>
 // One for function pointers...
 
 template <class F, class R, class RV, class args_type, size_t... Indices>

-typename enable_if<!is_member_function_pointer<F>::value, RV>::type
+typename enable_if<!is_member_function_pointer<F>::value, RV>::type inline 

 invoke(RV, F f, void *, R & r, args_type & t, tuple_indices<Indices...>) {
 invoke(RV, F f, void *, R & r, args_type & t, tuple_indices<Indices...>) {

-    return f(r, move(get<Indices>(t))...);
+    return f(r, get<Indices>(t)...);

 }
 
 // And one for pointers to member functions...
 
 template <class F, class C, class RV, class R, class args_type, size_t... Indices>
 }
 
 // And one for pointers to member functions...
 
 template <class F, class C, class RV, class R, class args_type, size_t... Indices>

-typename enable_if<is_member_function_pointer<F>::value, RV>::type
+typename enable_if<is_member_function_pointer<F>::value, RV>::type inline 

 invoke(RV, F f, C *c, R & r, args_type & t, tuple_indices<Indices...>) {
 invoke(RV, F f, C *c, R & r, args_type & t, tuple_indices<Indices...>) {

-    return (c->*f)(r, move(get<Indices>(t))...);
+    return (c->*f)(r, get<Indices>(t)...);

 }
 
 // The class marshalled_func_imp uses partial template specialization to
 }
 
 // The class marshalled_func_imp uses partial template specialization to

@@ -71,18 +71,15 @@ template <class Functor, class Instance, class Signature,
 // between various types of callable objects at this level of abstraction.
 
 template <class F, class C, class ErrorHandler, class R, class RV, class... Args>
 // between various types of callable objects at this level of abstraction.
 
 template <class F, class C, class ErrorHandler, class R, class RV, class... Args>

-struct marshalled_func_imp<F, C, RV(R&, Args...), ErrorHandler> {
+struct marshalled_func_imp<F, C, RV(R &, Args...), ErrorHandler> {

     static inline handler *wrap(F f, C *c=nullptr) {
     static inline handler *wrap(F f, C *c=nullptr) {

-        // This type definition corresponds to an empty struct with
-        // template parameters running from 0 up to (# args) - 1.
-        using Indices = typename make_tuple_indices<sizeof...(Args)>::type;

         // This type definition represents storage for f's unmarshalled
         // arguments.  decay is (most notably) stripping off const
         // qualifiers.
         using ArgsStorage = tuple<typename decay<Args>::type...>;
         // Allocate a handler (i.e. function) to hold the lambda
         // which will unmarshall RPCs and call f.
         // This type definition represents storage for f's unmarshalled
         // arguments.  decay is (most notably) stripping off const
         // qualifiers.
         using ArgsStorage = tuple<typename decay<Args>::type...>;
         // Allocate a handler (i.e. function) to hold the lambda
         // which will unmarshall RPCs and call f.

-        return new handler([=](unmarshall &u, marshall &m) -> RV {
+        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 decay<Args>::type>()...};
             // Unmarshall each argument with the correct type and store the
             // result in a tuple.
             ArgsStorage t{u._grab<typename decay<Args>::type>()...};

@@ -92,10 +89,10 @@ struct marshalled_func_imp<F, C, RV(R&, Args...), ErrorHandler> {
             // Allocate space for the RPC response -- will be passed into the
             // function as an lvalue reference.
             R r;
             // Allocate space for the RPC response -- will be passed into the
             // function as an lvalue reference.
             R r;

-            // Perform the invocation.  Note that Indices() calls the default
-            // constructor of the empty struct with the special template
-            // parameters.
-            RV b = invoke(RV(), f, c, r, t, Indices());
+            // Perform the invocation.  Note that TUPLE_INDICES calls the
+            // default constructor of an empty struct with template parameters
+            // running from 0 up to (# args) - 1.
+            RV b = invoke(RV(), f, c, r, t, TUPLE_INDICES(Args));

             // Marshall the response.
             m << r;
             // Make like a tree.
             // Marshall the response.
             m << r;
             // Make like a tree.

@@ -121,7 +118,7 @@ struct marshalled_func<F, ErrorHandler, RV(C::*)(Args...)> :
     public marshalled_func_imp<F, C, RV(Args...), ErrorHandler> {};
 
 template <class F, class ErrorHandler, class Signature>
     public marshalled_func_imp<F, C, RV(Args...), ErrorHandler> {};
 
 template <class F, class ErrorHandler, class Signature>

-struct marshalled_func<F, ErrorHandler, function<Signature>> :
+struct marshalled_func<F, ErrorHandler, std::function<Signature>> :

     public marshalled_func_imp<F, void, Signature, ErrorHandler> {};
 
 #endif
     public marshalled_func_imp<F, void, Signature, ErrorHandler> {};
 
 #endif