only use BEGIN_RCPP where it belongs

Author: romainfrancois

inst/include/Rcpp/InternalFunctionWithStdFunction.h

@@ -3,6 +3,7 @@
 // InternalFunction_with_std_function.h: Rcpp R/C++ interface class library -- exposing C++ std::function's
 //
 // Copyright (C) 2014 Christian Authmann
+// Copyright (C) 2015 Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -37,10 +38,8 @@ 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:
@@ -54,9 +53,7 @@ namespace Rcpp{
 				virtual ~CppFunctionBaseFromStdFunction() {}
 
 				SEXP operator()(SEXP* args) {
-					BEGIN_RCPP
 					call<void, Args...>(fun, args);
-					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 Romain Francois
+// Copyright (C) 2013 - 2015 Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -37,12 +37,10 @@ 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
     }
 
 }

inst/include/Rcpp/macros/xp.h

@@ -2,7 +2,7 @@
 //
 // xp.h: Rcpp R/C++ interface class library -- pre processor help
 //
-// Copyright (C) 2012 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2015 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -33,11 +33,11 @@ extern "C" SEXP RCPP_PP_CAT(__NAME__,__rcpp_info__)(){         \
     return info   ;                                            \
 }                                                              \
 extern "C" SEXP __NAME__( SEXP xp ){                           \
-	SEXP res = R_NilValue ;                                    \
 	BEGIN_RCPP                                                 \
+	    SEXP res = R_NilValue ;                                \
 		::Rcpp::XPtr< __CLASS__ > ptr(xp) ;                    \
 		res = ::Rcpp::wrap( ptr->__FIELD__ ) ;                 \
-	return res ;                                               \
+		return res ;                                           \
 	END_RCPP                                                   \
 }