remove unused things

romainfrancois · romainfrancois · commit c5cd6f6d5abf · 2013-10-08T18:55:07.000+02:00
diff --git a/man/Rcpp.package.skeleton.Rd b/man/Rcpp.package.skeleton.Rd
@@ -47,9 +47,7 @@ Rcpp.package.skeleton(name = "anRpackage", list = character(),
 	
 	The \samp{NAMESPACE}, if any, gains a \code{useDynLib} directive.
 	
-	The \samp{src} directory is created if it does not exists and 
-	a \samp{Makevars} file is added setting the environment variables
-	\samp{PKG_LIBS} to accomodate the necessary flags to link with the Rcpp library. 
+	The \samp{src} directory is created if it does not exists.
 	
 	If \code{cpp_files} are provided then they will be copied to the \samp{src}
 	directory.
diff --git a/src/barrier.cpp b/src/barrier.cpp
@@ -57,20 +57,10 @@ const char* char_nocheck__impl( SEXP x ){ return CHAR(x); }
 
 static bool Rcpp_cache_know = false ;
 static SEXP Rcpp_cache = R_NilValue ;
-static SEXP Rcpp_protection_stack = R_NilValue ;
 
 #define RCPP_HASH_CACHE_INDEX 4
-#define RCPP_PROTECTION_STACK_INDEX 5
 #define RCPP_CACHE_SIZE 6
 
-#ifndef RCPP_PROTECT_STACK_INITIAL_SIZE
-#define RCPP_PROTECT_STACK_INITIAL_SIZE 16384
-#endif
-
-#ifndef RCPP_PROTECT_STACK_INCREMENT
-#define RCPP_PROTECT_STACK_INCREMENT 4096
-#endif
-
 #ifndef RCPP_HASH_CACHE_INITIAL_SIZE
 #define RCPP_HASH_CACHE_INITIAL_SIZE 1024
 #endif 
@@ -83,7 +73,6 @@ SEXP get_rcpp_cache() {
         SEXP RCPP       = PROTECT( Rf_eval(Rf_lang2( getNamespaceSym, Rf_mkString("Rcpp11") ), R_GlobalEnv) );
         Rcpp_cache      = Rf_findVarInFrame( RCPP, Rf_install(".rcpp_cache") ) ;
         Rcpp_cache_know = true ;
-        Rcpp_protection_stack = VECTOR_ELT(Rcpp_cache, RCPP_PROTECTION_STACK_INDEX) ;
         UNPROTECT(1) ;
     }
     RCPP_DEBUG( "  [get_rcpp_cache] Rcpp_cache = <%p>", Rcpp_cache )
@@ -131,10 +120,6 @@ SEXP init_Rcpp11_cache(){
 	set_current_error( cache, R_NilValue ) ;
 	RCPP_SET_VECTOR_ELT( cache, 3, R_NilValue ) ; // stack trace
 	RCPP_SET_VECTOR_ELT( cache, RCPP_HASH_CACHE_INDEX, Rf_allocVector(INTSXP, RCPP_HASH_CACHE_INITIAL_SIZE) ) ;
-	SEXP stack = PROTECT( Rf_allocVector(VECSXP, RCPP_PROTECT_STACK_INITIAL_SIZE) ) ;
-	// we use true length to store "top"
-	SET_TRUELENGTH(stack, -1 ) ;
-	RCPP_SET_VECTOR_ELT( cache, RCPP_PROTECTION_STACK_INDEX, stack ) ;
 	Rf_defineVar( Rf_install(".rcpp_cache"), cache, RCPP );
     
 	UNPROTECT(3) ;
