More functional fixes.

Author: highperformancecoder

RESTProcess_base.h

@@ -719,7 +719,7 @@ namespace classdesc
   callFunction(const string& remainder, const REST_PROCESS_BUFFER& arguments, F f)
   {
     JSONBuffer argBuf(arguments);
-    auto& r=functional::CallOnBuffer(argBuf,f)();
+    auto& r=functional::callOnBuffer(argBuf,f);
     if (remainder.empty())
       {
         // if there are arguments left over, assign the first of the
@@ -757,7 +757,7 @@ namespace classdesc
   callFunction(const string& remainder, const REST_PROCESS_BUFFER& arguments, F f)
   {
     JSONBuffer argBuf(arguments);
-    auto r=functional::CallOnBuffer(argBuf,f)();
+    auto r=functional::callOnBuffer(argBuf,f);
     if (remainder.empty())
       {
         REST_PROCESS_BUFFER rj;
@@ -776,7 +776,7 @@ namespace classdesc
   callFunction(const string& remainder, const REST_PROCESS_BUFFER& arguments, F f)
   {
     JSONBuffer argBuf(arguments);
-    functional::CallOnBuffer(argBuf,f)();
+    functional::callOnBuffer(argBuf,f);
     return {};
   }
 

function.h

@@ -609,8 +609,11 @@ namespace classdesc
       R operator()() {return f();}
     };
 
+    template <class Buffer, class F>
+    typename Return<F>::T callOnBuffer(Buffer& buff, F f)
+    {return CallOnBuffer<Buffer,F,typename Return<F>::T>(buff,f)();}
 
-    
+  
     template <class Buffer>
     class PackFunctor: public Buffer
     {