merging ChangeLog with #342 by Florian

eddelbuettel · eddelbuettel · commit 194d172f6874 · 2015-08-25T05:49:28.000-05:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
+2015-08-24  Dirk Eddelbuettel  <edd@debian.org>
+
+        * vignettes/Rcpp.bib: Updated R / R Core references
+
 2015-08-19  Florian Plaza Oñate <florian.plaza@jouy.inra.fr>
-        * inst/include/Rcpp/vector/Vector.h: Add 'at' methods which implement 
+        * inst/include/Rcpp/vector/Vector.h: Add 'at' methods which implement
         accessors with bounds cheking (pull request #342, fixes issue #341)
         * inst/include/Rcpp/vector/Matrix.h: Ditto
         * inst/unitTests/cpp/Vector.cpp: Add unit tests for at acessors
diff --git a/inst/include/Rcpp/Benchmark/Timer.h b/inst/include/Rcpp/Benchmark/Timer.h
@@ -110,7 +110,7 @@ namespace Rcpp{
         }
 
         operator SEXP() const {
-            R_xlen_t n = data.size();
+            size_t n = data.size();
             NumericVector out(n);
             CharacterVector names(n);
             for (size_t i=0; i<n; i++) {
diff --git a/vignettes/Rcpp.bib b/vignettes/Rcpp.bib
@@ -468,17 +468,17 @@ @manual{R:Administration
   author =	 RCoreTeam,
   organization = RFoundation,
   address =	 {Vienna, Austria},
-  year =	 2013,
+  year =	 2015,
   title =	 "R Installation and Administration",
-  note =	 {{ISBN} 3-900051-09-7},
+  annote =	 {{ISBN} 3-900051-09-7},
   url =		 manuals # "R-admin.html"
 }
 
 @manual{R:Extensions,
   author =	 RCoreTeam,
   organization = RFoundation,
   address =	 {Vienna, Austria},
-  year =	 2012,
+  year =	 2015,
   title =	 "Writing R extensions",
   annote =	 {{ISBN} 3-900051-11-9},
   url =		 manuals # "R-exts.html"
@@ -488,7 +488,7 @@ @manual{R:Internals
   author =	 RCoreTeam,
   organization = RFoundation,
   address =	 {Vienna, Austria},
-  year =	 2013,
+  year =	 2015,
   title =	 "R internals",
   annote =	 {{ISBN} 3-900051-14-3},
   url =		 manuals # "R-ints.html"
@@ -500,15 +500,15 @@ @manual{R:Main
   author =	 RCoreTeam,
   organization = RFoundation,
   address =	 {Vienna, Austria},
-  year =	 2013,
+  year =	 2015,
   url =		 {http://www.R-project.org/},
 }
 
 @manual{R:Language,
   author =	 RCoreTeam,
   organization = RFoundation,
   address =	 {Vienna, Austria},
-  year =	 2013,
+  year =	 2015,
   title =	 "R language",
   annote =	 {{ISBN} 3-900051-13-5},
   url =		 manuals # "R-lang.html"

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ namespace Rcpp{`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`operator SEXP() const {`
`113`		`- R_xlen_t n = data.size();`
	`113`	`+ size_t n = data.size();`
`114`	`114`	`NumericVector out(n);`
`115`	`115`	`CharacterVector names(n);`
`116`	`116`	`for (size_t i=0; i<n; i++) {`