[Rcpp-commits] r3566 - in pkg/Rcpp: . inst/include src

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

Author: edd
Date: 2012-04-07 16:39:35 +0200 (Sat, 07 Apr 2012)
New Revision: 3566

Modified:
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/include/RcppCommon.h
   pkg/Rcpp/src/exceptions.cpp
Log:
also create a #define for gcc >= 4.6.0 and use it to include bits/exception_defines.h
define minor 0.9.10.2


Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2012-04-07 13:17:12 UTC (rev 3565)
+++ pkg/Rcpp/DESCRIPTION	2012-04-07 14:39:35 UTC (rev 3566)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.9.10.1
+Version: 0.9.10.2
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates and John Chambers

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2012-04-07 13:17:12 UTC (rev 3565)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2012-04-07 14:39:35 UTC (rev 3566)
@@ -86,10 +86,13 @@
     #if GCC_VERSION >= 40500
         #define IS_GCC_450_OR_LATER
     #endif
-    // g++ 4.6 no longer has exception_defines.h so need a flag for that
+    // g++ 4.6 switches from exception_defines.h to bits/exception_defines.h
     #if GCC_VERSION < 40600
         #define IS_EARLIER_THAN_GCC_460
     #endif
+    #if GCC_VERSION >= 40600
+        #define IS_GCC_460_OR_LATER
+    #endif
 #endif
 
 #ifdef __INTEL_COMPILER

Modified: pkg/Rcpp/src/exceptions.cpp
===================================================================
--- pkg/Rcpp/src/exceptions.cpp	2012-04-07 13:17:12 UTC (rev 3565)
+++ pkg/Rcpp/src/exceptions.cpp	2012-04-07 14:39:35 UTC (rev 3566)
@@ -69,6 +69,9 @@
 #ifdef IS_EARLIER_THAN_GCC_460
 #include <exception_defines.h>
 #endif
+#ifdef IS_GCC_460_OR_LATER
+#include <bits/exception_defines.h>
+#endif
 #include <cxxabi.h>
 
 std::string demangle( const std::string& name ){