Skip to content

Commit 8ddc3fa

Browse files
committed
now tests for defined(_AIX) in both required places
1 parent a53ecf7 commit 8ddc3fa

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

ChangeLog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
not declared by R with Rf_* name-mapping prefixes
1010

1111
2014-10-17 Chenliang Xu <luckyrand@gmail.com>
12-
12+
1313
* R/Attributes: Enable scanning of header files
14-
14+
1515
2014-10-03 JJ Allaire <jj@rstudio.org>
1616

1717
* R/Attributes.R: Only look for plugins in the package's namespace

src/api.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,14 @@ SEXP rcpp_can_use_cxx11(){
257257
// [[Rcpp::register]]
258258
SEXP stack_trace( const char* file, int line ){
259259
#if defined(__GNUC__)
260-
#if defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun)
260+
#if defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
261261
// Simpler version for Windows and *BSD
262-
List trace = List::create(
263-
_[ "file" ] = file,
264-
_[ "line" ] = line,
265-
_[ "stack" ] = "C++ stack not available on this system"
266-
) ;
262+
List trace = List::create(_["file"] = file,
263+
_[ "line" ] = line,
264+
_[ "stack" ] = "C++ stack not available on this system");
267265
trace.attr("class") = "Rcpp_stack_trace" ;
268266
return trace ;
269-
#else // ! (defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun)
267+
#else // ! (defined(WIN32) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__sun) || defined(_AIX)
270268

271269
/* inspired from http://tombarta.wordpress.com/2008/08/01/c-stack-traces-with-gcc/ */
272270
const size_t max_depth = 100;

0 commit comments

Comments
 (0)