Skip to content

Commit 05f8023

Browse files
capabilities now checks for the RCPP_HAS_LONG_LONG_TYPES macro
1 parent b42b629 commit 05f8023

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2013-09-13 Romain Francois <romain@r-enthusiasts.com>
2+
3+
* src/api.cpp : added "long long" to the capabilities function.
4+
15
2013-09-12 Romain Francois <romain@r-enthusiasts.com>
26

37
* include/Rcpp/platform/compiler.h : patch submitted by Murray for better

src/api.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,8 +1329,8 @@ SEXP rcpp_can_use_cxx0x(){
13291329
}
13301330

13311331
SEXP rcpp_capabilities(){
1332-
SEXP cap = PROTECT( Rf_allocVector( LGLSXP, 8) ) ;
1333-
SEXP names = PROTECT( Rf_allocVector( STRSXP, 8 ) ) ;
1332+
SEXP cap = PROTECT( Rf_allocVector( LGLSXP, 9) ) ;
1333+
SEXP names = PROTECT( Rf_allocVector( STRSXP, 9 ) ) ;
13341334
#ifdef HAS_VARIADIC_TEMPLATES
13351335
LOGICAL(cap)[0] = TRUE ;
13361336
#else
@@ -1365,6 +1365,12 @@ SEXP rcpp_capabilities(){
13651365
#endif
13661366

13671367
LOGICAL(cap)[7] = FALSE ;
1368+
1369+
#ifdef RCPP_HAS_LONG_LONG_TYPES
1370+
LOGICAL(cap)[8] = TRUE ;
1371+
#else
1372+
LOGICAL(cap)[8] = FALSE ;
1373+
#endif
13681374

13691375
SET_STRING_ELT(names, 0, Rf_mkChar("variadic templates") ) ;
13701376
SET_STRING_ELT(names, 1, Rf_mkChar("initializer lists") ) ;
@@ -1374,6 +1380,7 @@ SEXP rcpp_capabilities(){
13741380
SET_STRING_ELT(names, 5, Rf_mkChar("Rcpp modules") ) ;
13751381
SET_STRING_ELT(names, 6, Rf_mkChar("demangling") ) ;
13761382
SET_STRING_ELT(names, 7, Rf_mkChar("classic api") ) ;
1383+
SET_STRING_ELT(names, 8, Rf_mkChar("long long") ) ;
13771384
Rf_setAttrib( cap, R_NamesSymbol, names ) ;
13781385
UNPROTECT(2) ;
13791386
return cap ;

0 commit comments

Comments
 (0)