Merge branch 'master' of https://github.com/RcppCore/Rcpp

kevinushey · kevinushey · commit 59bb4b1c808c · 2014-03-18T15:37:39.000-07:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-18  JJ Allaire <jj@rstudio.org>
+
+        * man/cppFunction.Rd: Correct package header file example to use .h
+
 2014-03-14  Dirk Eddelbuettel  <edd@debian.org>
 
 	* inst/include/Rcpp/DataFrame.h (Rcpp): Add missing return in Impl method
diff --git a/man/cppFunction.Rd b/man/cppFunction.Rd
@@ -17,7 +17,7 @@ cppFunction(code, depends = character(), plugins = character(),
     Source code for the function definition.
 }
   \item{depends}{
-    Character vector of packages that the compilation depends on. Each package listed will first be queried for an \link[inline:plugins]{inline plugin} to determine header files to include. If no plugin is defined for the package then a header file based the package's name (e.g. \code{PkgName.hpp}) will be included.
+    Character vector of packages that the compilation depends on. Each package listed will first be queried for an \link[inline:plugins]{inline plugin} to determine header files to include. If no plugin is defined for the package then a header file based the package's name (e.g. \code{PkgName.h}) will be included.
 }
   \item{plugins}{
     Character vector of \link[inline:plugins]{inline plugins} to use for the compliation.

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +2014-03-18  JJ Allaire <[email protected]>
++
 +        * man/cppFunction.Rd: Correct package header file example to use .h
++
 -03-14  Dirk Eddelbuettel  <[email protected]>
 	* inst/include/Rcpp/DataFrame.h (Rcpp): Add missing return in Impl method
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ cppFunction(code, depends = character(), plugins = character(),`
`17`	`17`	`Source code for the function definition.`
`18`	`18`	`}`
`19`	`19`	`\item{depends}{`
`20`		`- Character vector of packages that the compilation depends on. Each package listed will first be queried for an \link[inline:plugins]{inline plugin} to determine header files to include. If no plugin is defined for the package then a header file based the package's name (e.g. \code{PkgName.hpp}) will be included.`
	`20`	`+ Character vector of packages that the compilation depends on. Each package listed will first be queried for an \link[inline:plugins]{inline plugin} to determine header files to include. If no plugin is defined for the package then a header file based the package's name (e.g. \code{PkgName.h}) will be included.`
`21`	`21`	`}`
`22`	`22`	`\item{plugins}{`
`23`	`23`	`Character vector of \link[inline:plugins]{inline plugins} to use for the compliation.`