[Rcpp-commits] r4277 - in pkg/Rcpp: . inst/include/Rcpp/platform

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

Author: edd
Date: 2013-03-08 17:15:20 +0100 (Fri, 08 Mar 2013)
New Revision: 4277

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
Log:
improved g++ version check by Yan Zhou

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-03-01 20:29:25 UTC (rev 4276)
+++ pkg/Rcpp/ChangeLog	2013-03-08 16:15:20 UTC (rev 4277)
@@ -1,3 +1,8 @@
+2013-03-08  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/include/Rcpp/platform/compiler.h: Improved g++ version
+	detection with thanks to Yan Zhou
+
 2013-02-28 JJ Allaire <jj at rstudio.org>
 
         * src/attributes.cpp: standalone roxygen chunks (e.g. to document

Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-03-01 20:29:25 UTC (rev 4276)
+++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-03-08 16:15:20 UTC (rev 4277)
@@ -90,7 +90,7 @@
 #include <cmath>
 #if defined(__INTEL_COMPILER) || (defined(__GNUC__) && !defined(__clang__))
     #if defined(__GLIBCXX__) && defined(__GXX_EXPERIMENTAL_CXX0X__)
-        #if __GLIBCXX__ >= 20090421 // GCC 4.4.0
+        #if GCC_VERSION >= 40400
             #define HAS_CXX0X_UNORDERED_MAP
             #define HAS_CXX0X_UNORDERED_SET
             #define HAS_CXX0X_INITIALIZER_LIST
@@ -113,7 +113,7 @@
 // Check TR1 Headers
 #if defined(__INTEL_COMPILER) || (defined(__GNUC__) && !defined(__clang__))
     #if defined(__GLIBCXX__)
-        #if __GLIBCXX__ >= 20070719 // GCC 4.2.1
+        #if GCC_VERSION >= 40400
             #define HAS_TR1_UNORDERED_MAP
             #define HAS_TR1_UNORDERED_SET
         #endif