[Rcpp-commits] r2092 - in pkg/Rcpp: . inst/include src

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

Author: romain
Date: 2010-09-10 12:08:32 +0200 (Fri, 10 Sep 2010)
New Revision: 2092

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/include/RcppCommon.h
   pkg/Rcpp/src/posixt.cpp
Log:
next version will depend on R 2.12.0

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2010-09-10 10:02:13 UTC (rev 2091)
+++ pkg/Rcpp/DESCRIPTION	2010-09-10 10:08:32 UTC (rev 2092)
@@ -33,7 +33,7 @@
  .
  Several examples are included, and 773 unit tests in 366 unit test functions
  provide additional usage examples.
-Depends: R (>= 2.10.0), methods
+Depends: R (>= 2.12.0), methods
 Suggests: RUnit, inline, highlight, rbenchmark
 URL: http://dirk.eddelbuettel.com/code/rcpp.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/Rcpp
 License: GPL (>= 2)

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2010-09-10 10:02:13 UTC (rev 2091)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2010-09-10 10:08:32 UTC (rev 2092)
@@ -110,10 +110,6 @@
 #include <Rversion.h>
 #define RCPP_GET_NAMES(x)	Rf_getAttrib(x, R_NamesSymbol)
 
-#if defined(R_VERSION) && R_VERSION >= R_Version(2, 12, 0)
-#define R_2_12_0
-#endif
-
 #include <Rcpp/complex.h>
 
 // #ifdef BUILDING_DLL

Modified: pkg/Rcpp/src/posixt.cpp
===================================================================
--- pkg/Rcpp/src/posixt.cpp	2010-09-10 10:02:13 UTC (rev 2091)
+++ pkg/Rcpp/src/posixt.cpp	2010-09-10 10:08:32 UTC (rev 2092)
@@ -26,13 +26,8 @@
 	
 SEXP getPosixClasses(){
 	SEXP datetimeclass = PROTECT(Rf_allocVector(STRSXP,2));
-#ifdef R_2_12_0
 	SET_STRING_ELT(datetimeclass, 0, Rf_mkChar("POSIXt"));
 	SET_STRING_ELT(datetimeclass, 1, Rf_mkChar("POSIXct"));
-#else
-	SET_STRING_ELT(datetimeclass, 0, Rf_mkChar("POSIXct"));
-	SET_STRING_ELT(datetimeclass, 1, Rf_mkChar("POSIXt"));
-#endif
 	UNPROTECT(1) ;
 	return datetimeclass ;
 }