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

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

Author: edd
Date: 2013-06-25 15:47:06 +0200 (Tue, 25 Jun 2013)
New Revision: 4374

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/NEWS.Rd
   pkg/Rcpp/src/api.cpp
Log:
added test for #define(__sun) around use of backtrace()


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-06-25 09:49:54 UTC (rev 4373)
+++ pkg/Rcpp/ChangeLog	2013-06-25 13:47:06 UTC (rev 4374)
@@ -1,5 +1,10 @@
-2013-06-25 Romain Francois <romain at r-enthusiasts.com>
+2013-06-25  Dirk Eddelbuettel  <edd at debian.org>
 
+	* src/api.cpp: Also test for #defined(__sun) when checking for system
+	lacking a valid backtrace() function for stack traces
+
+2013-06-25  Romain Francois <romain at r-enthusiasts.com>
+
         * DESCRIPTION : devel version 0.10.4.1
         * src/Module.cpp : bring a simplified version of RCPP_FUNCTION 1 .. 4
         * unitTests/runit.macros.R : removed, as RCPP_FUNCTION ... are deprecated

Modified: pkg/Rcpp/inst/NEWS.Rd
===================================================================
--- pkg/Rcpp/inst/NEWS.Rd	2013-06-25 09:49:54 UTC (rev 4373)
+++ pkg/Rcpp/inst/NEWS.Rd	2013-06-25 13:47:06 UTC (rev 4374)
@@ -3,8 +3,17 @@
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
   \section{Changes in Rcpp version 0.10.5 (future)}{
-  \item Deprecation of \code{RCPP_FUNCTION_*}:
+  \itemize{
+
+    \item Changes in Rcpp API:
     \itemize{
+      \item Add \code{#defined(__sun)} to lists of operating systems to
+      test for when checking for lack of \code{backtrace()} needed for
+      stack traces.
+    }
+
+    \item Deprecation of \code{RCPP_FUNCTION_*}:
+    \itemize{
       \item The macros from the \code{preprocessor_generated.h} 
       file have been deprecated. They are still available, but they print a message
       in addition to their expected behavior. 

Modified: pkg/Rcpp/src/api.cpp
===================================================================
--- pkg/Rcpp/src/api.cpp	2013-06-25 09:49:54 UTC (rev 4373)
+++ pkg/Rcpp/src/api.cpp	2013-06-25 13:47:06 UTC (rev 4374)
@@ -1533,7 +1533,7 @@
 }
 
 #if defined(__GNUC__)
-#if defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+#if defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun)
 // Simpler version for Windows and *BSD 
 SEXP stack_trace( const char* file, int line ){
     Rcpp::List trace = Rcpp::List::create( 
@@ -1543,7 +1543,7 @@
     trace.attr("class") = "Rcpp_stack_trace" ;
     return trace ;
 }
-#else // ! (defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+#else // ! (defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun)
 #include <execinfo.h>
 #include <cxxabi.h>