refining #3 a little, new minor release

eddelbuettel · Jan 2, 2017 · 10770b6 · 10770b6
1 parent 724a425
commit 10770b6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2017-01-02  Dirk Eddelbuettel  <edd@debian.org>
+
+	* R/RcppDataFrame.R: (RcppDataFrame): Print but return invisibly
+
+2017-01-02  Xikun Han  <1159225156@qq.com>
+
+	* R/RcppDataFrame.R: (RcppDataFrame): Avoid double printing of return
+
 2016-12-02  Dirk Eddelbuettel  <edd@debian.org>
 
 	* src/DateExample.cpp (DateExample): Examples take more advantage

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: RcppExamples
 Title: Examples using 'Rcpp' to Interface R and C++ 
-Version: 0.1.8
-Date: 2016-11-24
+Version: 0.1.8.1
+Date: 2017-01-02
 Author: Dirk Eddelbuettel and Romain Francois
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
 Description: Examples for Seamless R and C++ integration

diff --git a/R/RcppDataFrame.R b/R/RcppDataFrame.R
@@ -1,6 +1,6 @@
 ## RcppDataFrame.R: DataFrame example
 ##
-## Copyright (C) 2011 - 2016  Dirk Eddelbuettel and Romain Francois
+## Copyright (C) 2011 - 2017  Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RcppExamples.
 ##
@@ -32,7 +32,7 @@ RcppDataFrame <- function() {
     val <- DataFrameExample(D)
 
     cat("\nAfter call, original and new data frames:\n")
-    # print(val)
+    print(val)
 
-    val
+    invisible(val)
 }
diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -1,9 +1,12 @@
 \name{NEWS}
 \title{News for Package \pkg{RcppExamples}}
+\newcommand{\ghpr}{\href{https://github.com/eddelbuettel/rcppexamples/pull/#1}{##1}}
+\newcommand{\ghit}{\href{https://github.com/eddelbuettel/rcppexamples/issues/#1}{##1}}
 
 \section{Changes in RcppExamples version 0.1.9 (201x-yy-zz)}{
   \itemize{
     \item Extended DateExample to use more new Rcpp features
+    \item Do not print DataFrame result twice (Xikun Han in \ghpr{#3})
   }
 }