[Rcpp-commits] r3549 - in pkg/Rcpp: R src

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

Author: romain
Date: 2012-03-24 17:19:53 +0100 (Sat, 24 Mar 2012)
New Revision: 3549

Modified:
   pkg/Rcpp/R/exceptions.R
   pkg/Rcpp/src/Module.cpp
   pkg/Rcpp/src/Rcpp_init.c
   pkg/Rcpp/src/cache.cpp
Log:
re-adding rcpp_tryCatch in the R code for backwards compatibility, but it is not used anywhere

Modified: pkg/Rcpp/R/exceptions.R
===================================================================
--- pkg/Rcpp/R/exceptions.R	2012-03-24 14:49:50 UTC (rev 3548)
+++ pkg/Rcpp/R/exceptions.R	2012-03-24 16:19:53 UTC (rev 3549)
@@ -51,5 +51,8 @@
     invisible( .Call( rcpp_error_recorder, e ) )
 }
 
+# for backwards compatibility, but not used anywhere
+rcpp_tryCatch <- function(expr){ 
+    tryCatch(expr, error = .rcpp_error_recorder ) )
+}
 
-

Modified: pkg/Rcpp/src/Module.cpp
===================================================================
--- pkg/Rcpp/src/Module.cpp	2012-03-24 14:49:50 UTC (rev 3548)
+++ pkg/Rcpp/src/Module.cpp	2012-03-24 16:19:53 UTC (rev 3549)
@@ -2,7 +2,7 @@
 //
 // Module.cpp: Rcpp R/C++ interface class library -- Rcpp modules
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //

Modified: pkg/Rcpp/src/Rcpp_init.c
===================================================================
--- pkg/Rcpp/src/Rcpp_init.c	2012-03-24 14:49:50 UTC (rev 3548)
+++ pkg/Rcpp/src/Rcpp_init.c	2012-03-24 16:19:53 UTC (rev 3549)
@@ -2,7 +2,7 @@
 //
 // Rcpp_init.c : Rcpp R/C++ interface class library -- Initialize and register
 //
-// Copyright (C) 2010 - 2011 John Chambers, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2012 John Chambers, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //

Modified: pkg/Rcpp/src/cache.cpp
===================================================================
--- pkg/Rcpp/src/cache.cpp	2012-03-24 14:49:50 UTC (rev 3548)
+++ pkg/Rcpp/src/cache.cpp	2012-03-24 16:19:53 UTC (rev 3549)
@@ -2,7 +2,7 @@
 //
 // cache.cpp: Rcpp R/C++ interface class library -- Rcpp cache
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //