Fix Visual Studio compile error in C++ wrappers due to #include <exception> within extern "C" block.
Fixes SF #1340
This commit is contained in:
parent
5602a61bb6
commit
122f61cb0b
2 changed files with 5 additions and 1 deletions
|
|
@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
|
|||
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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue