Merge pull request #166 from cauthmann/std11detection

Std11detection

Author: eddelbuettel

inst/NEWS.Rd

@@ -7,8 +7,8 @@
     \item Changes in Rcpp API:
     \itemize{
       \item New \code{Rcpp::InternalFunction} interface using
-      \code{std::function}; it needs a \code{define} for \code{RCPP_USE_STD_FUNCTION} 
-      as sufficiently feature-rich C++11 implemented is needed.
+      \code{std::function}; only enabled on compilers that claim full c++11
+      support.
       \item The deprecation of \code{RCPP_FUNCTION_*} which was announced with
       release 0.10.5 last year is proceeding as planned, and the file
       \code{macros/preprocessor_generated.h} has been removed.

inst/include/Rcpp/InternalFunction.h

@@ -26,7 +26,7 @@
 
 #include <Rcpp/grow.h>
 
-#ifdef RCPP_USE_STD_FUNCTION
+#ifdef RCPP_USING_CXX11
 #include <Rcpp/InternalFunctionWithStdFunction.h>
 #endif
 
@@ -37,7 +37,7 @@ namespace Rcpp{
 
         RCPP_GENERATE_CTOR_ASSIGN(InternalFunction_Impl)
 
-#ifdef RCPP_USE_STD_FUNCTION
+#ifdef RCPP_USING_CXX11
     	template <typename RESULT_TYPE, typename... Args>
         InternalFunction_Impl(const std::function<RESULT_TYPE(Args...)> &fun) {
         	set(

inst/include/Rcpp/platform/compiler.h

@@ -58,10 +58,10 @@
     #endif
 #endif
 
-// Check C++0x features
+// Check C++0x/11 features
 #if defined(__INTEL_COMPILER)
     #if __cplusplus >= 201103L
-        #define HAS_CXX0X_FLAG
+        #define RCPP_USING_CXX11
         #if __INTEL_COMPILER >= 1210
             // #define HAS_VARIADIC_TEMPLATES
         #endif
@@ -71,7 +71,7 @@
     #endif
 #elif defined(__clang__)
     #if __cplusplus >= 201103L
-        #define HAS_CXX0X_FLAG
+        #define RCPP_USING_CXX11
         #if __has_feature(cxx_variadic_templates)
             // #define HAS_VARIADIC_TEMPLATES
         #endif
@@ -81,12 +81,14 @@
     #endif
 #elif defined(__GNUC__)
     #ifdef __GXX_EXPERIMENTAL_CXX0X__
-        // #define HAS_CXX0X_FLAG
         #if GCC_VERSION >= 40300
             // #define HAS_VARIADIC_TEMPLATES
             #define HAS_STATIC_ASSERT
         #endif
     #endif
+	#if GCC_VERSION >= 40800 && __cplusplus >= 201103L
+		#define RCPP_USING_CXX11
+	#endif
 #endif
 
 // Check C++0x headers
@@ -141,7 +143,7 @@
 #include <initializer_list>
 #endif
 
-#ifdef HAS_CXX0X_FLAG
+#ifdef RCPP_USING_CXX11
     #if defined(HAS_CXX0X_UNORDERED_MAP)
         #include <unordered_map>
         #define RCPP_USING_UNORDERED_MAP
@@ -185,4 +187,5 @@
   #define RCPP_HAS_DEMANGLING
 #endif
 
+
 #endif

inst/unitTests/cpp/InternalFunctionCPP11.cpp

@@ -20,7 +20,6 @@
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#define RCPP_USE_STD_FUNCTION
 #include <Rcpp.h>
 
 

inst/unitTests/runit.InternalFunctionCPP11.R

@@ -18,11 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-hasCXX11 <- grepl("-std=c\\+\\+1[1-9yz]", Sys.getenv("PKG_CXXFLAGS"))
+.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes" && hasCXX11
-
-if( .runThisTest ) {
+if( .runThisTest && Rcpp:::capabilities()[["Full C++11 support"]] ) {
 
     .tearDown <- function(){
         gc()

src/Rcpp_init.cpp

@@ -56,6 +56,7 @@ static R_CallMethodDef callEntries[]  = {
 
     CALLDEF(rcpp_capabilities,0),
     CALLDEF(rcpp_can_use_cxx0x,0),
+    CALLDEF(rcpp_can_use_cxx11,0),
     {NULL, NULL, 0}
 };
 

src/api.cpp

@@ -155,8 +155,8 @@ SEXP as_character_externalptr(SEXP xp){
 
 // [[Rcpp::internal]]
 SEXP rcpp_capabilities(){
-    Shield<SEXP> cap( Rf_allocVector( LGLSXP, 11 ) );
-    Shield<SEXP> names( Rf_allocVector( STRSXP, 11 ) );
+    Shield<SEXP> cap( Rf_allocVector( LGLSXP, 12 ) );
+    Shield<SEXP> names( Rf_allocVector( STRSXP, 12 ) );
     #ifdef HAS_VARIADIC_TEMPLATES
         LOGICAL(cap)[0] = TRUE ;
     #else
@@ -210,6 +210,12 @@ SEXP rcpp_capabilities(){
       LOGICAL(cap)[10] = FALSE ;
     #endif
 
+    #ifdef RCPP_USING_CXX11
+      LOGICAL(cap)[11] = TRUE ;
+    #else
+      LOGICAL(cap)[11] = FALSE ;
+    #endif
+
     SET_STRING_ELT(names, 0, Rf_mkChar("variadic templates") ) ;
     SET_STRING_ELT(names, 1, Rf_mkChar("initializer lists") ) ;
     SET_STRING_ELT(names, 2, Rf_mkChar("exception handling") ) ;
@@ -221,14 +227,25 @@ SEXP rcpp_capabilities(){
     SET_STRING_ELT(names, 8, Rf_mkChar("long long") ) ;
     SET_STRING_ELT(names, 9, Rf_mkChar("C++0x unordered maps") ) ;
     SET_STRING_ELT(names, 10, Rf_mkChar("C++0x unordered sets") ) ;
+    SET_STRING_ELT(names, 11, Rf_mkChar("Full C++11 support") ) ;
     Rf_setAttrib( cap, R_NamesSymbol, names ) ;
     return cap ;
 }
 
 
 // [[Rcpp::internal]]
 SEXP rcpp_can_use_cxx0x(){
-    #ifdef HAS_VARIADIC_TEMPLATES
+    #if defined(HAS_VARIADIC_TEMPLATES) || defined(RCPP_USING_CXX11)
+        return Rf_ScalarLogical( TRUE );
+    #else
+        return Rf_ScalarLogical( FALSE );
+    #endif
+}
+
+
+// [[Rcpp::internal]]
+SEXP rcpp_can_use_cxx11(){
+    #if defined(RCPP_USING_CXX11)
         return Rf_ScalarLogical( TRUE );
     #else
         return Rf_ScalarLogical( FALSE );

src/internal.h

@@ -120,6 +120,7 @@ CALLFUN_4(CppField__set);
 
 CALLFUN_0(rcpp_capabilities) ;
 CALLFUN_0(rcpp_can_use_cxx0x) ;
+CALLFUN_0(rcpp_can_use_cxx11) ;
 
 /* .External functions */
 EXTFUN(CppMethod__invoke) ;