From 5edf9fd49f6cc29a7007e00244bb19d29da92d57 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 22 Mar 2020 06:47:36 +0100 Subject: [PATCH 1/4] Add include guard --- inst/include/Rcpp/exceptions_impl.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inst/include/Rcpp/exceptions_impl.h b/inst/include/Rcpp/exceptions_impl.h index c873b95ac..e5f7bd62c 100644 --- a/inst/include/Rcpp/exceptions_impl.h +++ b/inst/include/Rcpp/exceptions_impl.h @@ -18,6 +18,9 @@ // You should have received a copy of the GNU General Public License // along with Rcpp. If not, see . +#ifndef Rcpp__exceptions_impl__h +#define Rcpp__exceptions_impl__h + // disable demangler on platforms where we have no support #ifndef RCPP_DEMANGLER_ENABLED # if defined(_WIN32) || \ @@ -102,3 +105,4 @@ namespace Rcpp { } +#endif From f9713fa154f9e4ab5aa894f6bcdce30cc97af4fd Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 22 Mar 2020 06:49:07 +0100 Subject: [PATCH 2/4] Make sure RCPP_DEMANGLER_ENABLED is always defined --- inst/include/Rcpp/exceptions_impl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inst/include/Rcpp/exceptions_impl.h b/inst/include/Rcpp/exceptions_impl.h index e5f7bd62c..227c04a6a 100644 --- a/inst/include/Rcpp/exceptions_impl.h +++ b/inst/include/Rcpp/exceptions_impl.h @@ -37,6 +37,8 @@ # elif defined(__GNUC__) || defined(__clang__) # include # define RCPP_DEMANGLER_ENABLED 1 +# else +# define RCPP_DEMANGLER_ENABLED 0 # endif #endif From e0b616602ee3bf391134cc524dc84aab7688cf51 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 22 Mar 2020 06:54:04 +0100 Subject: [PATCH 3/4] Add missing inline qualifier --- inst/include/Rcpp/exceptions_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inst/include/Rcpp/exceptions_impl.h b/inst/include/Rcpp/exceptions_impl.h index 227c04a6a..8f4502809 100644 --- a/inst/include/Rcpp/exceptions_impl.h +++ b/inst/include/Rcpp/exceptions_impl.h @@ -46,7 +46,7 @@ namespace Rcpp { // Extract mangled name e.g. ./test(baz+0x14)[0x400962] #if RCPP_DEMANGLER_ENABLED - static std::string demangler_one(const char* input) { // #nocov start + static inline std::string demangler_one(const char* input) { // #nocov start static std::string buffer; From 5af4b88cb2009f993e4bcc35f7ea07d8b42c059e Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 22 Mar 2020 07:19:05 +0100 Subject: [PATCH 4/4] Update ChangeLog --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6774a1f9e..35cd72150 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-03-22 Mattias Ellert + + * inst/include/Rcpp/exceptions_impl.h: Add include guard, + Make sure RCPP_DEMANGLER_ENABLED is always defined, + Add missing inline qualifier + 2020-03-18 Dirk Eddelbuettel * DESCRIPTION (Version, Date): Roll minor version