[Rcpp-commits] r267 - in pkg: inst src

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

Author: edd
Date: 2010-01-04 16:27:06 +0100 (Mon, 04 Jan 2010)
New Revision: 267

Modified:
   pkg/inst/ChangeLog
   pkg/src/RcppCommon.cpp
   pkg/src/exceptions.cpp
Log:
remove two more unused variables so that g++ -Wall is quiet


Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-01-03 20:58:48 UTC (rev 266)
+++ pkg/inst/ChangeLog	2010-01-04 15:27:06 UTC (rev 267)
@@ -1,3 +1,8 @@
+2010-01-04  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/excections.cpp: Get rid of another unused variable
+	* src/RcppCommon.cpp: Idem
+
 2010-01-03  Romain Francois <francoisromain at free.fr>
 
 	* src/Rcpp/Environment.h: Environment gains the parent
@@ -2,75 +7,75 @@
 	method that returns the parent environment
-	
+
 	* src/Rcpp/as.h: template as<> to convert SEXP to classic
 	C++ types, fcactored out of RObject
-	
+
 	* src/as.cpp: specific implementations. as<int>, as<bool>
 	as<string>, ...
-	
+
 	* inst/unitTests/runit.as.R: unit tests
 
 	* src/Rcpp/wrap.h : factored out from RObject. there is now a
-	template wrap in addition to the specific implementations. The 
+	template wrap in addition to the specific implementations. The
 	template generates a warning and return NULL
-	
+
 	* src/wrap.cpp: specific implementations of the wrap template
 	(factored out of RObject)
 
-	* src/Rcpp/pairlist.h : variadic templates to 
-	recursively generate a pairlist 
-	(CAR and CDR) from any number of "wrap("'able objects. 
-	(factored out of Language)  
-	
+	* src/Rcpp/pairlist.h : variadic templates to
+	recursively generate a pairlist
+	(CAR and CDR) from any number of "wrap("'able objects.
+	(factored out of Language)
+
 	* src/pairlist.cpp: end of recursion for the above
-	
-	* src/Rcpp/grow.h : grow a pairlist with any wrappable 
+
+	* src/Rcpp/grow.h : grow a pairlist with any wrappable
 	object. Used in pairlist
-	
+
 	* src/grow.cpp : specific implementation for Named object
 	to allow tagging the head of the pairlist.
-	
+
 	* src/Rcpp/Named.h : new class Named that is used to specify
 	named elements in a pairlist.
-	
+
 	* src/Named.cpp: implementation
-	
+
 	* src/Rcpp/RObject.h: added wrap(const char* const) RObject factory
 	method
 
-	* src/Rcpp/RObject.h: rework the garbage collection mechanism so that 
-	it is automatic and hidden. methods preserve and release are now 
+	* src/Rcpp/RObject.h: rework the garbage collection mechanism so that
+	it is automatic and hidden. methods preserve and release are now
 	private to the RObject class and the SEXP may only be changed using
 	the protected setSEXP member function. isPreserved and forgetPreserve
 	are defunct.
-	
+
 	* src/Rcpp/RObject.h: RObject gains assignment operators and copy constructors
-	
+
 	* src/RcppCommon.h: added the CXX0X define that controls whether
 	we can use C++0x features offered by the gcc. currently the define
-	is hardcoded, but this will eventually be a configure guess. The 
+	is hardcoded, but this will eventually be a configure guess. The
 	canUseCXX0X function can be called to bring this back to R
-	
-	* R/RcppLdPath.R: added the canUseCXX0X R function to query 
-	the internal canUseCXX0X function, use this in RcppCxxFlags so that 
-	code linking against Rcpp (inline code or packages) can take 
+
+	* R/RcppLdPath.R: added the canUseCXX0X R function to query
+	the internal canUseCXX0X function, use this in RcppCxxFlags so that
+	code linking against Rcpp (inline code or packages) can take
 	advantage of it
 
 	* src/Rcpp/Language.h : new class Rcpp::Language to manage calls
 	(LANGSXP SEXP)
-	
+
 	* src/Language.cpp : implementation
-	
+
 	* inst/unitTests/runit.Language.R: unit tests
 
 	* src/Rcpp/Environment.h : added constructors and made the SEXP based
 	constructor smarter (using as.environment)
-	
+
 	* inst/unitTests/runit.environments.R: more unit tests
-	
-	* src/Rcpp/Symbol.h: new class Rcpp::Symbol to encapsulate 
+
+	* src/Rcpp/Symbol.h: new class Rcpp::Symbol to encapsulate
 	symbols. This allows to use Symbol("rnorm") instead of the most cryptic
 	Rf_install("rnorm")
-	
+
 	* src/Symbol.cpp: implementation
-	
+
 	* inst/unitTests/runit.Symbol.R: unit tests

Modified: pkg/src/RcppCommon.cpp
===================================================================
--- pkg/src/RcppCommon.cpp	2010-01-03 20:58:48 UTC (rev 266)
+++ pkg/src/RcppCommon.cpp	2010-01-04 15:27:06 UTC (rev 267)
@@ -60,7 +60,6 @@
 }
 
 SEXP canUseCXX0X(){
-	SEXP res ;
 #ifdef CXX0X
 	return Rf_ScalarLogical( TRUE ) ;
 #else

Modified: pkg/src/exceptions.cpp
===================================================================
--- pkg/src/exceptions.cpp	2010-01-03 20:58:48 UTC (rev 266)
+++ pkg/src/exceptions.cpp	2010-01-04 15:27:06 UTC (rev 267)
@@ -75,7 +75,7 @@
 }
 
 SEXP initUncaughtExceptionHandler(){
-    void (*old_terminate)() = std::set_terminate(forward_uncaught_exceptions_to_r);
+    std::set_terminate(forward_uncaught_exceptions_to_r);
     return R_NilValue ;
 }