[Rcpp-commits] r1060 - in pkg/RcppGSL: . inst/unitTests src

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

Author: romain
Date: 2010-04-17 14:33:03 +0200 (Sat, 17 Apr 2010)
New Revision: 1060

Modified:
   pkg/RcppGSL/DESCRIPTION
   pkg/RcppGSL/inst/unitTests/runit.gsl.R
   pkg/RcppGSL/src/RcppGSL.cpp
Log:
back to using .Call

Modified: pkg/RcppGSL/DESCRIPTION
===================================================================
--- pkg/RcppGSL/DESCRIPTION	2010-04-17 12:31:46 UTC (rev 1059)
+++ pkg/RcppGSL/DESCRIPTION	2010-04-17 12:33:03 UTC (rev 1060)
@@ -1,13 +1,13 @@
 Package: RcppGSL
 Type: Package
 Title: Glue between Rcpp and the GNU GSL
-Version: 0.0
+Version: 0.0.1
 Date: 2010-04-04
 Author: Romain Francois and Dirk Eddelbuettel
 Maintainer: Dirk Eddelbuettel and Romain Francois <RomainAndDirk at r-enthusiasts.com>
 Description: Glue between Rcpp and the GNU GSL
 License: GPL (>=2)
 LazyLoad: yes
-Depends: Rcpp (>= 0.7.12.5)
+Depends: Rcpp (>= 0.7.12.6)
 LinkingTo: Rcpp
 SystemRequirements: GNU GSL

Modified: pkg/RcppGSL/inst/unitTests/runit.gsl.R
===================================================================
--- pkg/RcppGSL/inst/unitTests/runit.gsl.R	2010-04-17 12:31:46 UTC (rev 1059)
+++ pkg/RcppGSL/inst/unitTests/runit.gsl.R	2010-04-17 12:33:03 UTC (rev 1060)
@@ -18,7 +18,7 @@
 # along with RcppGSL.  If not, see <http://www.gnu.org/licenses/>.
 
 test.gsl.vector <- function(){
-	res <- .Cpp( "test_gsl_vector", PACKAGE = "RcppGSL" )
+	res <- .Call( "test_gsl_vector", PACKAGE = "RcppGSL" )
 	checkEquals( res, 
 		list( 
 			"gsl_vector" = numeric(10), 
@@ -48,7 +48,7 @@
 		dim( x )  <- c(5,2)
 		x
 	}
-	res <- .Cpp( "test_gsl_matrix", PACKAGE = "RcppGSL" )
+	res <- .Call( "test_gsl_matrix", PACKAGE = "RcppGSL" )
 	checkEquals( res, 
 		list( 
 			"gsl_matrix"                     = helper( numeric ), 
@@ -71,14 +71,14 @@
 }
 
 test.gsl.vector.view <- function(){
-	res <- .Cpp( "test_gsl_vector_view", PACKAGE = "RcppGSL" )
+	res <- .Call( "test_gsl_vector_view", PACKAGE = "RcppGSL" )
 	checkEquals( res, 
 		list( even = 2.0 * 0:4, odd = 2.0 * 0:4 + 1.0 ), 
 		msg = "wrap( gsl.vector.view )" )
 }
 
 test.gsl.matrix.view <- function(){
-	res <- .Cpp( "test_gsl_matrix_view", PACKAGE = "RcppGSL" )
+	res <- .Call( "test_gsl_matrix_view", PACKAGE = "RcppGSL" )
 	checkEquals( res$full[3:4, 3:4], res$view, msg = "wrap(gsl.matrix.view)" )
 }
 

Modified: pkg/RcppGSL/src/RcppGSL.cpp
===================================================================
--- pkg/RcppGSL/src/RcppGSL.cpp	2010-04-17 12:31:46 UTC (rev 1059)
+++ pkg/RcppGSL/src/RcppGSL.cpp	2010-04-17 12:33:03 UTC (rev 1060)
@@ -145,3 +145,10 @@
 	return res ;
 }
 
+#if defined(WIN32)
+#include <R_ext/Rdynload.h>
+void R_init_RcppGSL(DllInfo* info){
+	std::set_terminate( forward_uncaught_exceptions_to_r ) ;
+}
+#endif
+