[Rcpp-commits] r1419 - pkg/Rcpp/inst/include/Rcpp

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-06-04 13:50:10 +0200 (Fri, 04 Jun 2010)
New Revision: 1419

Modified:
   pkg/Rcpp/inst/include/Rcpp/Module.h
   pkg/Rcpp/inst/include/Rcpp/preprocessor.h
Log:
need a void version of END_RCPP

Modified: pkg/Rcpp/inst/include/Rcpp/Module.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Module.h	2010-06-04 11:30:49 UTC (rev 1418)
+++ pkg/Rcpp/inst/include/Rcpp/Module.h	2010-06-04 11:50:10 UTC (rev 1419)
@@ -274,7 +274,7 @@
 		}
 		prop_class* prop =  it->second ;
 		return prop->set( XP(object), value ); 
-	END_RCPP
+	VOID_END_RCPP
 	}
 
 #include <Rcpp/module/Module_Add_Property.h>

Modified: pkg/Rcpp/inst/include/Rcpp/preprocessor.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/preprocessor.h	2010-06-04 11:30:49 UTC (rev 1418)
+++ pkg/Rcpp/inst/include/Rcpp/preprocessor.h	2010-06-04 11:50:10 UTC (rev 1419)
@@ -51,8 +51,12 @@
 #define BEGIN_RCPP try{ 
 #endif 
 
+#ifndef VOID_END_RCPP
+#define VOID_END_RCPP } catch( std::exception& __ex__ ){ forward_exception_to_r( __ex__ ) ; } catch(...){ ::Rf_error( "c++ exception (unknown reason)" ) ; }
+#endif
+
 #ifndef END_RCPP
-#define END_RCPP } catch( std::exception& __ex__ ){ forward_exception_to_r( __ex__ ) ; } catch(...){ ::Rf_error( "c++ exception (unknown reason)" ) ; } return R_NilValue;
+#define END_RCPP VOID_END_RCPP return R_NilValue;
 #endif
 
 #include <Rcpp/preprocessor_generated.h>