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

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

Author: romain
Date: 2013-09-13 10:59:25 +0200 (Fri, 13 Sep 2013)
New Revision: 4475

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/src/api.cpp
Log:
capabilities now checks for the RCPP_HAS_LONG_LONG_TYPES macro

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-09-12 14:02:24 UTC (rev 4474)
+++ pkg/Rcpp/ChangeLog	2013-09-13 08:59:25 UTC (rev 4475)
@@ -1,3 +1,7 @@
+2013-09-13 Romain Francois <romain at r-enthusiasts.com>
+
+	* src/api.cpp : added "long long" to the capabilities function.  
+
 2013-09-12 Romain Francois <romain at r-enthusiasts.com>
 
 	* include/Rcpp/platform/compiler.h : patch submitted by Murray for better

Modified: pkg/Rcpp/src/api.cpp
===================================================================
--- pkg/Rcpp/src/api.cpp	2013-09-12 14:02:24 UTC (rev 4474)
+++ pkg/Rcpp/src/api.cpp	2013-09-13 08:59:25 UTC (rev 4475)
@@ -1329,8 +1329,8 @@
 }
 
 SEXP rcpp_capabilities(){
-	SEXP cap = PROTECT( Rf_allocVector( LGLSXP, 8) ) ;
-	SEXP names = PROTECT( Rf_allocVector( STRSXP, 8 ) ) ;
+	SEXP cap = PROTECT( Rf_allocVector( LGLSXP, 9) ) ;
+	SEXP names = PROTECT( Rf_allocVector( STRSXP, 9 ) ) ;
 #ifdef HAS_VARIADIC_TEMPLATES
 	LOGICAL(cap)[0] = TRUE ;
 #else
@@ -1365,6 +1365,12 @@
 #endif
 
 	LOGICAL(cap)[7] = FALSE ;
+	
+#ifdef RCPP_HAS_LONG_LONG_TYPES
+	LOGICAL(cap)[8] = TRUE ;
+#else
+    LOGICAL(cap)[8] = FALSE ;
+#endif
 
 	SET_STRING_ELT(names, 0, Rf_mkChar("variadic templates") ) ;
 	SET_STRING_ELT(names, 1, Rf_mkChar("initializer lists") ) ;
@@ -1374,6 +1380,7 @@
 	SET_STRING_ELT(names, 5, Rf_mkChar("Rcpp modules") ) ;
 	SET_STRING_ELT(names, 6, Rf_mkChar("demangling") ) ;
 	SET_STRING_ELT(names, 7, Rf_mkChar("classic api") ) ;
+	SET_STRING_ELT(names, 8, Rf_mkChar("long long") ) ;
 	Rf_setAttrib( cap, R_NamesSymbol, names ) ;
 	UNPROTECT(2) ;
 	return cap ;