Skip to content
Browse files

Fix Visual Studio compile error in C++ wrappers due to #include <exce…

…ption> within extern "C" block.

Fixes SF #1340
  • Loading branch information...
1 parent 5602a61 commit 122f61cb0bcedb15db0612f9519de4d396f75efc @wsfulton wsfulton committed Oct 17, 2013
Showing with 5 additions and 1 deletion.
  1. +4 −0 CHANGES.current
  2. +1 −1 Lib/r/rrun.swg
View
4 CHANGES.current
@@ -6,6 +6,10 @@ Version 2.0.12 (9 Feb 2014)
===========================
2013-10-17: wsfulton
+ [R] Fix SF #1340 - Visual Studio compile error in C++ wrappers due to #include <exception>
+ within extern "C" block.
+
+2013-10-17: wsfulton
[Python] Fix SF #1345 - Missing #include <stddef.h> for offsetof when using -builtin.
2013-10-12: wsfulton
View
2 Lib/r/rrun.swg
@@ -1,5 +1,6 @@
#ifdef __cplusplus
+#include <exception>
extern "C" {
#endif
@@ -369,7 +370,6 @@ SWIG_R_ConvertPacked(SEXP obj, void *ptr, size_t sz, swig_type_info *ty) {
}
#ifdef __cplusplus
-#include <exception>
#define SWIG_exception_noreturn(code, msg) do { throw std::runtime_error(msg); } while(0)
#else
#define SWIG_exception_noreturn(code, msg) do { return result; } while(0)

0 comments on commit 122f61c

Please sign in to comment.
Something went wrong with that request. Please try again.