[Rcpp-commits] r3989 - in pkg/Rcpp: . inst/doc/Rcpp-modules

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

Author: edd
Date: 2012-11-17 16:25:06 +0100 (Sat, 17 Nov 2012)
New Revision: 3989

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/doc/Rcpp-modules/Rcpp-modules.Rnw
Log:
adjusting modules vignette by renaming range() in Uniform example to uniformRange()


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-11-17 09:43:46 UTC (rev 3988)
+++ pkg/Rcpp/ChangeLog	2012-11-17 15:25:06 UTC (rev 3989)
@@ -1,16 +1,23 @@
+2012-11-17  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/doc/Rcpp-modules/Rcpp-modules.Rnw: Change free function name
+	'range' to 'uniformRange' to protect it from getting clobbered by the
+	new sugar function range.
+
 2012-11-17  Romain Francois <romain at r-enthusiasts.com>
 
-        * include/Rcpp/internal/wrap_end.h: have calls to wrap as late as possible
-        so that they "see" all (potentially user defined) overloads of wrap.
-        * include/Rcpp/internal/SEXP_Iterator.h: directly iterate over SEXP. 
+        * include/Rcpp/internal/wrap_end.h: have calls to wrap as late as
+	possible so that they "see" all (potentially user defined) overloads
+	of wrap.
+        * include/Rcpp/internal/SEXP_Iterator.h: directly iterate over SEXP.
         const iterator for List and ExpressionVector
 
 2012-11-16  Romain Francois <romain at r-enthusiasts.com>
 
-        * include/Rcpp/vector/Vector.h : added static methods Vector::is_na and
-        Vector::get_na
-        * include/Rcpp/sugar/functions/setdiff.h: initial version of 
-        setdiff and intersect
+        * include/Rcpp/vector/Vector.h : added static methods Vector::is_na
+	and Vector::get_na
+        * include/Rcpp/sugar/functions/setdiff.h: initial version of setdiff
+	and intersect
         * include/Rcpp/vector/MatrixColumn.h: dealing with const-ness
         * include/Rcpp/vector/MatrixRow.h: dealing with const-ness
         * include/Rcpp/vector/traits.h: dealing with const-ness
@@ -20,23 +27,23 @@
 
 2012-11-15  Romain Francois <romain at r-enthusiasts.com>
 
-        * include/Rcpp/sugar/logical/SingleLogicalResult.h : apply patch suggested
-        by Karl Millar
+        * include/Rcpp/sugar/logical/SingleLogicalResult.h : apply patch
+	suggested by Karl Millar
         * R/Attributes.R: new R function areMacrosDefined
         * man/evalCpp.Rd: documentation update
         * include/Rcpp/sugar/functions/match.h : generic version of match
-        * include/Rcpp/sugar/tools/iterator.h: help iterator that helps writing match 
-        in terms of stl algorithms.
+        * include/Rcpp/sugar/tools/iterator.h: help iterator that helps
+	writing match in terms of stl algorithms.
         * include/Rcpp/vector/Vector.h: class no_init that can be used to create
         an uninitialized vector. e.g. IntegerVector out = no_init(10) ;
-        * include/Rcpp/sugar/functions/unique.h: sugar version of %in% using 
-        unordered_set
+        * include/Rcpp/sugar/functions/unique.h: sugar version of %in% using
+	unordered_set
         * include/Rcpp/sugar/functions/minmax.h: min, max, and range
 
 2012-11-14  JJ Allaire <jj at rstudio.org>
 
-        * src/Attributes.cpp: create sourceCpp context list using 
-          single statement
+        * src/Attributes.cpp: create sourceCpp context list using single
+	statement
 
 2012-11-14  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2012-11-17 09:43:46 UTC (rev 3988)
+++ pkg/Rcpp/DESCRIPTION	2012-11-17 15:25:06 UTC (rev 3989)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.10.0.1
+Version: 0.10.0.2
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates, John Chambers and JJ Allaire

Modified: pkg/Rcpp/inst/doc/Rcpp-modules/Rcpp-modules.Rnw
===================================================================
--- pkg/Rcpp/inst/doc/Rcpp-modules/Rcpp-modules.Rnw	2012-11-17 09:43:46 UTC (rev 3988)
+++ pkg/Rcpp/inst/doc/Rcpp-modules/Rcpp-modules.Rnw	2012-11-17 15:25:06 UTC (rev 3989)
@@ -618,7 +618,7 @@
     double min, max;
 };
 
-double range( Uniform* w) {
+double uniformRange( Uniform* w) {
     return w->max - w->min;
 }
 
@@ -632,7 +632,7 @@
     .field( "max", &Uniform::max )
 
     .method( "draw", &Uniform::draw )
-    .method( "range", &range )
+    .method( "range", &uniformRange )
     ;
 
 }
@@ -653,7 +653,7 @@
     double min, max;
 };
 
-double range( Uniform* w) {
+double uniformRange( Uniform* w) {
     return w->max - w->min;
 }
 
@@ -667,7 +667,7 @@
     .field( "max", &Uniform::max )
 
     .method( "draw", &Uniform::draw )
-    .method( "range", &range )
+    .method( "range", &uniformRange )
     ;
 
 }