From 8da4d6712d3d0170d4f85813796f2e4c42c643b5 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 17 Oct 2013 21:54:58 +0100
Subject: Fix Visual Studio compile error in C++ wrappers due to #include
 <exception> within extern "C" block.

Fixes SF #1340
---
 CHANGES.current | 4 ++++
 Lib/r/rrun.swg  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index 9621a4952..8989ee194 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 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.
 
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)
-- 
cgit v1.2.1