Merge pull request #1055 from ellert/exceptions-impl-fixes

Exceptions impl fixes

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,9 @@
+2020-03-22  Mattias Ellert  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* DESCRIPTION (Version, Date): Roll minor version

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 <http://www.gnu.org/licenses/>.
 
+#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)     || \
@@ -34,14 +37,16 @@
 # elif defined(__GNUC__)  || defined(__clang__)
 #  include <execinfo.h>
 #  define RCPP_DEMANGLER_ENABLED 1
+# else
+#  define RCPP_DEMANGLER_ENABLED 0
 # endif
 #endif
 
 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;
 
@@ -102,3 +107,4 @@ namespace Rcpp {
 
 }
 
+#endif