diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-10-17 21:54:58 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-10-17 21:54:58 +0100 |
| commit | 8da4d6712d3d0170d4f85813796f2e4c42c643b5 (patch) | |
| tree | ae227bd683c7a3285b1c2a0e1beecf64b5b3568b | |
| parent | 0e54a51c104ecf1c1a68892132d9506890a99036 (diff) | |
| download | swig-8da4d6712d3d0170d4f85813796f2e4c42c643b5.tar.gz | |
Fix Visual Studio compile error in C++ wrappers due to #include <exception> within extern "C" block.
Fixes SF #1340
| -rw-r--r-- | CHANGES.current | 4 | ||||
| -rw-r--r-- | Lib/r/rrun.swg | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.current b/CHANGES.current index 9621a4952..8989ee194 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -6,6 +6,10 @@ Version 3.0.0 (in progress) ============================ 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-15: vadz diff --git a/Lib/r/rrun.swg b/Lib/r/rrun.swg index f8bc9f497..990443e23 100644 --- a/Lib/r/rrun.swg +++ b/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) |