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

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

Author: romain
Date: 2013-09-12 15:26:42 +0200 (Thu, 12 Sep 2013)
New Revision: 4473

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
Log:
gcc 4.2.1 has tr1 unordered maps and sets

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-09-12 10:02:11 UTC (rev 4472)
+++ pkg/Rcpp/ChangeLog	2013-09-12 13:26:42 UTC (rev 4473)
@@ -2,6 +2,8 @@
 
 	* include/Rcpp/platform/compiler.h : patch submitted by Murray for better
 	support of long long type. 
+	* include/Rcpp/platform/compiler.h : gcc 4.2.1 has tr1/unordered_map 
+	and tr1/unordered_set. Previous test was for gcc 4.4.0 for some reason
 
 2013-08-31  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/Rcpp/inst/include/Rcpp/platform/compiler.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-09-12 10:02:11 UTC (rev 4472)
+++ pkg/Rcpp/inst/include/Rcpp/platform/compiler.h	2013-09-12 13:26:42 UTC (rev 4473)
@@ -116,7 +116,7 @@
 // Check TR1 Headers
 #if defined(__INTEL_COMPILER) || (defined(__GNUC__) && !defined(__clang__))
     #if defined(__GLIBCXX__)
-        #if GCC_VERSION >= 40400
+        #if GCC_VERSION >= 40201
             #define HAS_TR1_UNORDERED_MAP
             #define HAS_TR1_UNORDERED_SET
         #endif