Skip to content

Commit 88a23b8

Browse files
catch all instead of catching eval_error
1 parent 55b4571 commit 88a23b8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

inst/include/Rcpp/Environment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ namespace Rcpp{
322322
try{
323323
SEXP getNamespaceSym = Rf_install("getNamespace");
324324
env = Rcpp_eval( Rf_lang2(getNamespaceSym, Rf_mkString(package.c_str()) ) ) ;
325-
} catch( const eval_error& ex){
325+
} catch( ... ){
326326
throw no_such_namespace( package ) ;
327327
}
328328
return Environment_Impl( env ) ;

inst/unitTests/runit.environments.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,23 +181,23 @@ test.environment.unlockBinding <- function(){
181181
}
182182

183183
test.environment.global.env <- function(){
184-
checkEquals( runit_globenv(), globalenv(), msg = "REnvironment::global_env" )
184+
checkEquals( runit_globenv(), globalenv(), msg = "Environment::global_env" )
185185
}
186186

187187
test.environment.empty.env <- function(){
188-
checkEquals( runit_emptyenv(), emptyenv(), msg = "REnvironment::empty_env" )
188+
checkEquals( runit_emptyenv(), emptyenv(), msg = "Environment::empty_env" )
189189
}
190190

191191
test.environment.base.env <- function(){
192-
checkEquals( runit_baseenv(), baseenv(), msg = "REnvironment::base_env" )
192+
checkEquals( runit_baseenv(), baseenv(), msg = "Environment::base_env" )
193193
}
194194

195195
test.environment.empty.env <- function(){
196-
checkEquals( runit_emptyenv(), .BaseNamespaceEnv, msg = "REnvironment::base_namespace" )
196+
checkEquals( runit_emptyenv(), .BaseNamespaceEnv, msg = "Environment::base_namespace" )
197197
}
198198

199199
test.environment.namespace.env <- function(){
200-
checkEquals( runit_namespace("Rcpp"), asNamespace("Rcpp"), msg = "REnvironment::base_namespace" )
200+
checkEquals( runit_namespace("Rcpp"), asNamespace("Rcpp"), msg = "Environment::base_namespace" )
201201

202202
can.demangle <- Rcpp:::capabilities()[["demangling"]]
203203
if( can.demangle ){

0 commit comments

Comments
 (0)