bring master's changes

Author: romainfrancois

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
 Version: 0.10.6.1
-Date: $Date$
+Date: 2013-11-13
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates, John Chambers and JJ Allaire
 Maintainer: Dirk Eddelbuettel <edd@debian.org>

inst/unitTests/cpp/wrap.cpp

@@ -137,10 +137,14 @@ List multimap_string_generic(){
 }
 
 // [[Rcpp::export]]
-SEXP null_const_char(){ const char *p = NULL; return wrap(p); }
+SEXP null_const_char(){ 
+    const char *p = NULL; return wrap(p); 
+}
 
 // [[Rcpp::export]]
-SEXP nonnull_const_char(){ const char *p = "foo"; return wrap(p) ; }
+SEXP nonnull_const_char(){ 
+    const char *p = "foo"; return wrap(p) ; 
+}
 
 // [[Rcpp::export]]
 IntegerVector unordered_map_string_int(){

vignettes/Rcpp-unitTests.Rnw

@@ -30,8 +30,10 @@ library(RUnit)
 <<unitTesting,echo=FALSE,print=FALSE>>=
 pkg <- "Rcpp"
 
-## Make sure we run all tests for the vignette
-Sys.setenv("RunAllRcppTests"="yes")
+## Check the environemnt variable to see if all tests should be run
+if (Sys.getenv("RunAllRcppTests") != "yes") {
+    writeLines("The environment variable 'RunAllRcppTests' was not set to 'yes', so skipping some tests.")
+}
 
 if (file.exists("unitTests-results")) unlink("unitTests-results", recursive = TRUE)
 dir.create("unitTests-results")
@@ -61,7 +63,7 @@ results <- "unitTests-results/Rcpp-unitTests.txt"
 if (file.exists(results)) {
     writeLines(readLines(results))
 } else{
-    writeLines( "unit test results not available" )
+    writeLines("Unit test results not available")
 }
 @