[Xts-commits] r781 - in pkg/xts: . inst/include

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

Author: edd
Date: 2013-06-27 04:27:03 +0200 (Thu, 27 Jun 2013)
New Revision: 781

Modified:
   pkg/xts/DESCRIPTION
   pkg/xts/inst/include/xts.h
   pkg/xts/inst/include/xtsAPI.h
Log:
correcting (exported) header for na_locf() by adding fourth argument
rolling version to 0.9-5 to differentiate from CRAN version 0.9-5


Modified: pkg/xts/DESCRIPTION
===================================================================
--- pkg/xts/DESCRIPTION	2013-06-19 12:27:42 UTC (rev 780)
+++ pkg/xts/DESCRIPTION	2013-06-27 02:27:03 UTC (rev 781)
@@ -1,8 +1,8 @@
 Package: xts
 Type: Package
 Title: eXtensible Time Series
-Version: 0.9-4
-Date: 2013-01-14
+Version: 0.9-5.1
+Date: 2013-06-26
 Author: Jeffrey A. Ryan, Joshua M. Ulrich
 Depends: zoo (>= 1.7-10)
 LinkingTo: zoo (>= 1.7-10)

Modified: pkg/xts/inst/include/xts.h
===================================================================
--- pkg/xts/inst/include/xts.h	2013-06-19 12:27:42 UTC (rev 780)
+++ pkg/xts/inst/include/xts.h	2013-06-27 02:27:03 UTC (rev 781)
@@ -82,7 +82,7 @@
 SEXP do_merge_xts(SEXP x, SEXP y, SEXP all, SEXP fill, SEXP retclass, SEXP colnames, 
                   SEXP suffixes, SEXP retside, SEXP env, int coerce);
 SEXP na_omit_xts(SEXP x);
-SEXP na_locf(SEXP x, SEXP fromlast, SEXP maxgap);
+SEXP na_locf(SEXP x, SEXP fromlast, SEXP maxgap, SEXP limit);
 
 SEXP tryXts(SEXP x);
 

Modified: pkg/xts/inst/include/xtsAPI.h
===================================================================
--- pkg/xts/inst/include/xtsAPI.h	2013-06-19 12:27:42 UTC (rev 780)
+++ pkg/xts/inst/include/xtsAPI.h	2013-06-27 02:27:03 UTC (rev 781)
@@ -129,11 +129,11 @@
     return fun(x);
 }
 
-SEXP attribute_hidden xtsNaLocf(SEXP x, SEXP fromLast, SEXP maxgap) {
-  static SEXP(*fun)(SEXP,SEXP,SEXP) = NULL;
+SEXP attribute_hidden xtsNaLocf(SEXP x, SEXP fromLast, SEXP maxgap, SEXP limit) {
+    static SEXP(*fun)(SEXP,SEXP,SEXP,SEXP) = NULL;
     if (fun == NULL) 
-      fun = (SEXP(*)(SEXP,SEXP,SEXP)) R_GetCCallable("xts","na_locf");
-    return fun(x, fromLast, maxgap);
+        fun = (SEXP(*)(SEXP,SEXP,SEXP,SEXP)) R_GetCCallable("xts","na_locf");
+    return fun(x, fromLast, maxgap, limit);
 }
 
 #ifdef __cplusplus