[Rcpp-commits] r4219 - in pkg/RcppXts: . inst src

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

Author: edd
Date: 2013-01-18 19:49:03 +0100 (Fri, 18 Jan 2013)
New Revision: 4219

Modified:
   pkg/RcppXts/ChangeLog
   pkg/RcppXts/DESCRIPTION
   pkg/RcppXts/inst/NEWS.Rd
   pkg/RcppXts/src/xtsMod.cpp
Log:
Version 0.0.4 depending on xts 0.9-2 now on CRAN


Modified: pkg/RcppXts/ChangeLog
===================================================================
--- pkg/RcppXts/ChangeLog	2013-01-17 02:18:29 UTC (rev 4218)
+++ pkg/RcppXts/ChangeLog	2013-01-18 18:49:03 UTC (rev 4219)
@@ -1,3 +1,9 @@
+2013-01-18  Dirk Eddelbuettel  <edd at debian.org>
+
+	* DESCRIPTION (Version): 0.0.4
+
+	* DESCRIPTION (Depends): Increased to xts 0.9-2 now on CRAN
+
 2013-01-16  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION (Version): 0.0.3
@@ -2,3 +8,3 @@
 
-	* DESCRIPTION (Depends): Increased to xts 0.9-1.2 which new xtsAPI.h
+	* DESCRIPTION (Depends): Increased to xts 0.9-1.2 with its new xtsAPI.h
 

Modified: pkg/RcppXts/DESCRIPTION
===================================================================
--- pkg/RcppXts/DESCRIPTION	2013-01-17 02:18:29 UTC (rev 4218)
+++ pkg/RcppXts/DESCRIPTION	2013-01-18 18:49:03 UTC (rev 4219)
@@ -1,7 +1,7 @@
 Package: RcppXts
 Type: Package
 Title: Interface the xts API via Rcpp
-Version: 0.0.3
+Version: 0.0.4
 Date: $Date$
 Author: Dirk Eddelbuettel
 Maintainer: Dirk Eddelbuettel <edd at debian.org>
@@ -11,6 +11,6 @@
  In its current state, the package is mostly a proof-of-concept to support
  adding useful functions, and does not yet add any of its own.
 License: GPL (>= 2)
-Depends: methods, Rcpp (>= 0.10.2), xts (>= 0.9-1.2)
+Depends: methods, Rcpp (>= 0.10.2), xts (>= 0.9-2)
 LinkingTo: Rcpp, xts
 RcppModules: xts

Modified: pkg/RcppXts/inst/NEWS.Rd
===================================================================
--- pkg/RcppXts/inst/NEWS.Rd	2013-01-17 02:18:29 UTC (rev 4218)
+++ pkg/RcppXts/inst/NEWS.Rd	2013-01-18 18:49:03 UTC (rev 4219)
@@ -1,13 +1,33 @@
 \name{NEWS}
-\title{News for Package \pkg{RcppCNPy}}
+\title{News for Package \pkg{RcppXts}}
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
-\section{Changes in version 0.0.1 (2012-07-04)}{
+\section{Changes in version 0.0.4 (2013-01-18)}{
   \itemize{
-    \item Initial version, as a Rcpp modules wrapping of code in
-    \cpkg{xts} itself. 
-    \item At present, no added functionality is provided but the package
-    builds and loads and established a base from which extensions can be
-    built.
+    \item Depends on (unreleased) \cpkg{xts} 0.9-2 now on CRAN
+  }
+}
+
+\section{Changes in version 0.0.3 (2013-01-16)}{
+  \itemize{
+    \item Depends on (unreleased) \cpkg{xts} 0.9-1.2
+    \item This version uses the new \code{xtsAPI.h} we committed to
+    \code{xts} itself, and which uses new function names \code{xts*} all
+    using prefixed with \code{xts} for consistency
+    \item R functions and manual page renamed accordingly
+  }
+}
+
+\section{Changes in version 0.0.2 (2013-01-15)}{
+  \itemize{
+    \item Depends on (unreleased) \cpkg{xts} 0.9-1.1
+    \item New demo functions for coredata, merge, lag
+    \item Simple test function
+  }
+}
+
+\section{Changes in version 0.0.1 (2013-01-12)}{
+  \itemize{
+    \item Initial version
   } 
 }

Modified: pkg/RcppXts/src/xtsMod.cpp
===================================================================
--- pkg/RcppXts/src/xtsMod.cpp	2013-01-17 02:18:29 UTC (rev 4218)
+++ pkg/RcppXts/src/xtsMod.cpp	2013-01-18 18:49:03 UTC (rev 4219)
@@ -21,13 +21,8 @@
 
 #include <Rcpp.h>               // need to include the main Rcpp header file only
 
-// what is in xts.h does not matter; what matters is what has been 'registered' 
-// at the end of init.c in the xts sources
+#include <xtsAPI.h>    		// xts exported functions
 
-extern "C" {
-    #include <xtsAPI.h>    	// xts headers and exported functions
-}
-
 // wrapped so that we get a bool instead of int
 bool xtsIsWrap(SEXP x)              { return xtsIs(x);         }
 bool xtsNaCheckWrap(SEXP x, SEXP y) { return xtsNaCheck(x, y); }