Merge pull request #293 from RcppCore/bugfix/revert-modules-begin-end-changes

Revert changes to modules related to BEGIN/END macros

Author: eddelbuettel

inst/include/Rcpp/InternalFunctionWithStdFunction.h

@@ -38,8 +38,10 @@ namespace Rcpp {
                 virtual ~CppFunctionBaseFromStdFunction() {}
 
                 SEXP operator()(SEXP* args) {
+                    BEGIN_RCPP
                     auto result = call<RESULT_TYPE, Args...>(fun, args);
                     return Rcpp::module_wrap<RESULT_TYPE>(result);
+                    END_RCPP
                 }
 
             private:
@@ -53,8 +55,9 @@ namespace Rcpp {
                  virtual ~CppFunctionBaseFromStdFunction() {}
 
                  SEXP operator()(SEXP* args) {
+                     BEGIN_RCPP
                      call<void, Args...>(fun, args);
-                     return R_NilValue;
+                     END_RCPP
                  }
 
             private:

inst/include/Rcpp/api/meat/module/Module.h

@@ -1,6 +1,6 @@
 // Module.h: Rcpp R/C++ interface class library -- Rcpp modules
 //
-// Copyright (C) 2013 - 2015 Romain Francois
+// Copyright (C) 2013 Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -37,10 +37,12 @@ namespace Rcpp {
 	}
 
     inline CppClass Module::get_class( const std::string& cl ){
+        BEGIN_RCPP
             CLASS_MAP::iterator it = classes.find(cl) ;
             if( it == classes.end() ) throw std::range_error( "no such class" ) ;
             std::string buffer ;
             return CppClass( this, it->second, buffer ) ;
+        END_RCPP
     }
 
 }