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

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

Author: romain
Date: 2010-04-21 23:24:57 +0200 (Wed, 21 Apr 2010)
New Revision: 1100

Modified:
   pkg/Rcpp/inst/include/Rcpp/Environment.h
   pkg/Rcpp/src/Environment.cpp
   pkg/Rcpp/src/RcppCommon.cpp
Log:
no_such_binding was not in the throw list of Environment::remove

Modified: pkg/Rcpp/inst/include/Rcpp/Environment.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Environment.h	2010-04-21 21:10:49 UTC (rev 1099)
+++ pkg/Rcpp/inst/include/Rcpp/Environment.h	2010-04-21 21:24:57 UTC (rev 1100)
@@ -359,7 +359,7 @@
     /**
      * remove an object from this environment
      */
-    bool remove( const std::string& name ) throw(binding_is_locked) ;
+    bool remove( const std::string& name ) throw(binding_is_locked,no_such_binding) ;
     
     /**
      * locks this environment. See ?lockEnvironment

Modified: pkg/Rcpp/src/Environment.cpp
===================================================================
--- pkg/Rcpp/src/Environment.cpp	2010-04-21 21:10:49 UTC (rev 1099)
+++ pkg/Rcpp/src/Environment.cpp	2010-04-21 21:24:57 UTC (rev 1100)
@@ -135,7 +135,7 @@
     	return true ;
     }
     
-    bool Environment::remove( const std::string& name) throw(binding_is_locked){
+    bool Environment::remove( const std::string& name) throw(binding_is_locked,no_such_binding){
     	    if( exists(name) ){
     	    	    if( bindingIsLocked(name) ){
     	    	    	    throw binding_is_locked(name) ;

Modified: pkg/Rcpp/src/RcppCommon.cpp
===================================================================
--- pkg/Rcpp/src/RcppCommon.cpp	2010-04-21 21:10:49 UTC (rev 1099)
+++ pkg/Rcpp/src/RcppCommon.cpp	2010-04-21 21:24:57 UTC (rev 1100)
@@ -121,7 +121,7 @@
 }
 
 extern "C" void R_init_Rcpp(DllInfo* info){
-	initUncaughtExceptionHandler() ;
+	// initUncaughtExceptionHandler() ;
 }
    
 namespace Rcpp{