[Rcpp-commits] r1546 - in pkg/Rcpp: . inst/include/Rcpp src

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

Author: romain
Date: 2010-06-15 22:51:14 +0200 (Tue, 15 Jun 2010)
New Revision: 1546

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/include/Rcpp/Language.h
   pkg/Rcpp/src/Language.cpp
Log:
Language::eval needs a throw declaration

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-06-15 15:39:53 UTC (rev 1545)
+++ pkg/Rcpp/DESCRIPTION	2010-06-15 20:51:14 UTC (rev 1546)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Rcpp R/C++ interface package
-Version: 0.8.2.4
+Version: 0.8.2.5
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Simon Urbanek, David Reiss and Douglas Bates; based on code written during 

Modified: pkg/Rcpp/inst/include/Rcpp/Language.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Language.h	2010-06-15 15:39:53 UTC (rev 1545)
+++ pkg/Rcpp/inst/include/Rcpp/Language.h	2010-06-15 20:51:14 UTC (rev 1546)
@@ -130,12 +130,12 @@
 	/**
 	 * eval this call in the global environment
 	 */
-	SEXP eval() ;
+	SEXP eval() throw(eval_error) ;
 
 	/**
 	 * eval this call in the requested environment
 	 */
-	SEXP eval(SEXP env) ;
+	SEXP eval(SEXP env) throw(eval_error) ;
 
 	~Language() ;
 

Modified: pkg/Rcpp/src/Language.cpp
===================================================================
--- pkg/Rcpp/src/Language.cpp	2010-06-15 15:39:53 UTC (rev 1545)
+++ pkg/Rcpp/src/Language.cpp	2010-06-15 20:51:14 UTC (rev 1546)
@@ -71,11 +71,11 @@
 		SET_TAG( m_sexp, R_NilValue ) ;
 	}
 	
-	SEXP Language::eval(){
+	SEXP Language::eval() throw(eval_error) {
 		return eval( R_GlobalEnv ) ;
 	}
 	
-	SEXP Language::eval( SEXP env ){
+	SEXP Language::eval( SEXP env ) throw(eval_error) {
 		return internal::try_catch( m_sexp, env );
 	}