update ChangeLog and NEWS for #150

eddelbuettel · eddelbuettel · commit 60d31de11039 · 2014-06-20T11:18:26.000-05:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,8 @@
-<<<<<<< HEAD
+2014-06-20  Dirk Eddelbuettel  <edd@debian.org>
+
+        * include/Rcpp/sugar/functions/ifelse.h: Applied pull request #150 by
+        Romain to have operator{} return the correct NA type
+
 2014-06-11  Dirk Eddelbuettel  <edd@debian.org>
 
         * inst/include/Rcpp/macros/macros.h: No longer include
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -10,6 +10,11 @@
       release 0.10.5 last year is proceeding as planned, and the file
       \code{macros/preprocessor_generated.h} has been removed.
     }
+    \item Changes in Rcpp Sugar:
+    \itemize{
+      \item In \code{ifelse()}, the returned \code{NA} type was corrected for
+      \code{operator[]} 
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,11 @@`
`10`	`10`	`release 0.10.5 last year is proceeding as planned, and the file`
`11`	`11`	`\code{macros/preprocessor_generated.h} has been removed.`
`12`	`12`	`}`
	`13`	`+ \item Changes in Rcpp Sugar:`
	`14`	`+ \itemize{`
	`15`	`+ \item In \code{ifelse()}, the returned \code{NA} type was corrected for`
	`16`	`+ \code{operator[]}`
	`17`	`+ }`
`13`	`18`	`}`
`14`	`19`	`}`
`15`	`20`