[Rcpp-commits] r903 - in pkg/Rcpp: . R inst

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

Author: edd
Date: 2010-03-15 19:33:54 +0100 (Mon, 15 Mar 2010)
New Revision: 903

Modified:
   pkg/Rcpp/NEWS
   pkg/Rcpp/R/RcppLdpath.R
   pkg/Rcpp/inst/ChangeLog
Log:
unbreak RcppLdPaths on Windows by undoing overly clumsy attempt to protect pathnames with spaces


Modified: pkg/Rcpp/NEWS
===================================================================
--- pkg/Rcpp/NEWS	2010-03-15 17:57:31 UTC (rev 902)
+++ pkg/Rcpp/NEWS	2010-03-15 18:33:54 UTC (rev 903)
@@ -1,24 +1,26 @@
 
 0.7.10  (under development)
 
-	o	new class Rcpp::S4 whose constructor checks if the object is an S4 object
+    o	new class Rcpp::S4 whose constructor checks if the object is an S4 object
 	
-	o	maximum number of templated arguments to the pairlist function, 
-		the DottedPair constructor, the Language constructor and the 
-		Pairlist constructor has been updated to 20 (was 5) and a script has been
-		added to the source tree should we want to change it again
+    o	maximum number of templated arguments to the pairlist function, 
+	the DottedPair constructor, the Language constructor and the 
+	Pairlist constructor has been updated to 20 (was 5) and a script has been
+	added to the source tree should we want to change it again
 
+    o   reversed attempt to protect Windows paths with spaces
+
 0.7.9   2010-03-12
 
     o	Another small improvement to Windows build flags
 
     o	bugfix on 64 bit platforms. The traits classes (wrap_type_traits, etc)
-		used size_t when they needed to actually use unsigned int
+	used size_t when they needed to actually use unsigned int
 
     o	fixed pre gcc 4.3 compatibility. The trait class that was used to 
-		identify if a type is convertible to another had too many false positives
-		on pre gcc 4.3 (no tr1 or c++0x features). fixed by implementing the 
-		section 2.7 of "Modern C++ Design" book. 
+	identify if a type is convertible to another had too many false positives
+	on pre gcc 4.3 (no tr1 or c++0x features). fixed by implementing the 
+	section 2.7 of "Modern C++ Design" book. 
 
 0.7.8   2010-03-09
 

Modified: pkg/Rcpp/R/RcppLdpath.R
===================================================================
--- pkg/Rcpp/R/RcppLdpath.R	2010-03-15 17:57:31 UTC (rev 902)
+++ pkg/Rcpp/R/RcppLdpath.R	2010-03-15 18:33:54 UTC (rev 903)
@@ -21,9 +21,9 @@
     rcppdir <- RcppLdPath()
     if (static) {                               # static is default on Windows and OS X
         flags <- paste(rcppdir, "/libRcpp.a", sep="")
-        if (.Platform$OS.type=="windows") {
-            flags <- paste('"', flags, '"', sep="")
-        }
+        #if (.Platform$OS.type=="windows") {
+        #    flags <- paste('"', flags, '"', sep="")
+        #}
     } else {					# else for dynamic linking
         flags <- paste("-L", rcppdir, " -lRcpp", sep="") # baseline setting
         if ((.Platform$OS.type == "unix") &&    # on Linux, we can use rpath to encode path
@@ -40,9 +40,9 @@
 ## Provide compiler flags -- i.e. -I/path/to/Rcpp.h
 RcppCxxFlags <- function(cxx0x=FALSE) {
     path <- RcppLdPath()
-    if (.Platform$OS.type=="windows") {
-        path <- paste('"', path, '"', sep="")
-    }
+    #if (.Platform$OS.type=="windows") {
+    #    path <- paste('"', path, '"', sep="")
+    #}
     paste("-I", path, if( cxx0x && canUseCXX0X() ) " -std=c++0x" else "", sep="")
 }
 

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-03-15 17:57:31 UTC (rev 902)
+++ pkg/Rcpp/inst/ChangeLog	2010-03-15 18:33:54 UTC (rev 903)
@@ -1,15 +1,19 @@
+2010-03-15  Dirk Eddelbuettel  <edd at debian.org>
+
+	* RcppLdpath.R: Remove attempt to protect spaces Windows pathnames
+
 2010-03-15  Romain Francois <romain at r-enthusiasts.com>
 
-	* inst/codebloat/codebloat.R: script to generate code (creating a pairlist
-	with up to n arguments).
+	* inst/codebloat/codebloat.R: script to generate code (creating a
+	pairlist with up to n arguments).
 
-	* src/Rcpp/Function.h : Function gains a body method to retrieve the body
-	of the function (using the BODY macro from Rinternals.h)
+	* src/Rcpp/Function.h : Function gains a body method to retrieve
+	the body of the function (using the BODY macro from Rinternals.h)
 
 2010-03-14  Romain Francois <romain at r-enthusiasts.com>
 
-	* src/Rcpp/S4.h : Rcpp::S4 gains a new constructor taking a string 
-	reference and building a new S4 object of that type. This throws an 
+	* src/Rcpp/S4.h : Rcpp::S4 gains a new constructor taking a string
+	reference and building a new S4 object of that type. This throws an
 	exception if the object is not successfully created (e.g the class
 	is not a known S4 class)