Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2026-01-12 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version and date
* inst/include/Rcpp/config.h: Idem

* inst/include/Rcpp/exceptions_impl.h: Combine previous and current
methods enabling when 'execinfo.h' is found on selected platforms

2026-01-08 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Date, Version): Release 1.1.1
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.1.1
Date: 2026-01-07
Version: 1.1.1.1
Date: 2026-01-12
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
comment = c(ORCID = "0000-0001-6419-907X")),
person("Romain", "Francois", role = "aut",
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define RCPP_VERSION_STRING "1.1.1"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,1,1,0)
#define RCPP_DEV_VERSION_STRING "1.1.1.0"
#define RCPP_DEV_VERSION RcppDevVersion(1,1,1,1)
#define RCPP_DEV_VERSION_STRING "1.1.1.1"

#endif
34 changes: 26 additions & 8 deletions inst/include/Rcpp/exceptions_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// Copyright (C) 2012 - 2019 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2020 - 2024 Dirk Eddelbuettel, Romain Francois, and Joshua N. Pritikin
// Copyright (C) 2025 Dirk Eddelbuettel, Romain Francois, Joshua N. Pritikin, and Iñaki Ucar
// Copyright (C) 2025 - 2026 Dirk Eddelbuettel, Romain Francois, Joshua N. Pritikin, and Iñaki Ucar
//
// This file is part of Rcpp.
//
Expand All @@ -23,15 +23,33 @@
#define Rcpp__exceptions_impl__h

// enable demangler on platforms where execinfo.h is present
// and that are not actively blacklisted
#ifndef RCPP_DEMANGLER_ENABLED
# define RCPP_DEMANGLER_ENABLED 0
# if defined __has_include
# if __has_include (<execinfo.h>)
# include <execinfo.h>
# undef RCPP_DEMANGLER_ENABLED
# define RCPP_DEMANGLER_ENABLED 1
// set a fallback default
#define RCPP_DEMANGLER_ENABLED 0
# if defined(_WIN32) || \
defined(__FreeBSD__) || \
defined(__NetBSD__) || \
defined(__OpenBSD__) || \
defined(__DragonFly__) || \
defined(__CYGWIN__) || \
defined(__sun) || \
defined(_AIX) || \
defined(__MUSL__) || \
defined(__HAIKU__) || \
defined(__ANDROID__)
// nothing to do here so just redefining
# undef RCPP_DEMANGLER_ENABLED
# define RCPP_DEMANGLER_ENABLED 0
# elif defined __has_include
// if we can test for headers
# if __has_include (<execinfo.h>)
// if we have the header, include and use it
# include <execinfo.h>
# undef RCPP_DEMANGLER_ENABLED
# define RCPP_DEMANGLER_ENABLED 1
# endif
# endif
# endif
#endif

namespace Rcpp {
Expand Down