[Rcpp-commits] r2341 - in pkg/Rcpp: . src

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

Author: edd
Date: 2010-10-19 15:57:34 +0200 (Tue, 19 Oct 2010)
New Revision: 2341

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/src/posixt.cpp
Log:
bugfix to actually order POSIXct, POSIXt for R 2.12.0


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2010-10-19 03:36:27 UTC (rev 2340)
+++ pkg/Rcpp/ChangeLog	2010-10-19 13:57:34 UTC (rev 2341)
@@ -1,3 +1,7 @@
+2010-10-19  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/posixt.cpp: Correct POSIXct, POSIXt ordering for R 2.12.0
+
 2010-10-14  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION (Version): Release 0.8.7

Modified: pkg/Rcpp/src/posixt.cpp
===================================================================
--- pkg/Rcpp/src/posixt.cpp	2010-10-19 03:36:27 UTC (rev 2340)
+++ pkg/Rcpp/src/posixt.cpp	2010-10-19 13:57:34 UTC (rev 2341)
@@ -26,8 +26,8 @@
 	
 SEXP getPosixClasses(){
 	SEXP datetimeclass = PROTECT(Rf_allocVector(STRSXP,2));
-	SET_STRING_ELT(datetimeclass, 0, Rf_mkChar("POSIXt"));
-	SET_STRING_ELT(datetimeclass, 1, Rf_mkChar("POSIXct"));
+	SET_STRING_ELT(datetimeclass, 0, Rf_mkChar("POSIXct"));
+	SET_STRING_ELT(datetimeclass, 1, Rf_mkChar("POSIXt"));
 	UNPROTECT(1) ;
 	return datetimeclass ;
 }