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

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

Author: edd
Date: 2012-07-07 03:09:27 +0200 (Sat, 07 Jul 2012)
New Revision: 3675

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/NEWS
   pkg/Rcpp/inst/include/Rcpp/config.h
   pkg/Rcpp/src/exceptions.cpp
Log:
 o more conservative about where RCPP_HAS_DEMANGLING is defined to exclude OS X
   as clang 3.1 did not manage to include exception_defines.h


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-07-06 23:42:46 UTC (rev 3674)
+++ pkg/Rcpp/ChangeLog	2012-07-07 01:09:27 UTC (rev 3675)
@@ -1,3 +1,10 @@
+2012-07-06  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/include/Rcpp/config.h: In order to not attempt to include
+	exception_defines.h if on OS X (as the clang runtime may not have
+	predictable access to g+++ headers providing these), do not define
+	RCPP_HAS_DEMANGLING which is used in src/exceptions.cpp
+
 2012-06-28  Dirk Eddelbuettel  <edd at debian.org>
 
         * DESCRIPTION: Release 0.9.13

Modified: pkg/Rcpp/inst/NEWS
===================================================================
--- pkg/Rcpp/inst/NEWS	2012-07-06 23:42:46 UTC (rev 3674)
+++ pkg/Rcpp/inst/NEWS	2012-07-07 01:09:27 UTC (rev 3675)
@@ -1,3 +1,9 @@
+0.9.14  2012-xx-yy
+
+    o   Be more conservative about where we support clang++ and the inclusion
+        of exception_defines.h and prevent this from being attempted on OS X
+        where it failed for clang 3.1
+
 0.9.13  2012-06-28
 
     o   Truly corrected Rcpp::Environment class by having default constructor

Modified: pkg/Rcpp/inst/include/Rcpp/config.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/config.h	2012-07-06 23:42:46 UTC (rev 3674)
+++ pkg/Rcpp/inst/include/Rcpp/config.h	2012-07-07 01:09:27 UTC (rev 3675)
@@ -23,7 +23,12 @@
 #define RCPP__CONFIG_H
 
 #ifdef __GNUC__
-#define RCPP_HAS_DEMANGLING
+  // from http://sourceforge.net/apps/mediawiki/predef/index.php?title=Operating_Systems#MacOS
+  #ifndef __APPLE__ 
+    #ifndef __MACH__
+      #define RCPP_HAS_DEMANGLING
+    #endif
+  #ednif
 #endif
 
 #define Rcpp_Version(v,p,s) (((v) * 65536) + ((p) * 256) + (s))

Modified: pkg/Rcpp/src/exceptions.cpp
===================================================================
--- pkg/Rcpp/src/exceptions.cpp	2012-07-06 23:42:46 UTC (rev 3674)
+++ pkg/Rcpp/src/exceptions.cpp	2012-07-07 01:09:27 UTC (rev 3675)
@@ -61,9 +61,9 @@
 #undef RCPP_SIMPLE_EXCEPTION_WHAT
 }
 
-/* for now, the fancy exception handling is only available in GCC, 
-   simply because we've not investigated if it is available in other 
-   compilers */
+// for now, the fancy exception handling is only available in GCC, 
+// simply because we've not investigated if it is available in other 
+// compilers 
 #ifdef RCPP_HAS_DEMANGLING
 #include <typeinfo>
 #ifdef __GNUC__