From c574b947876b03ce22e27da26a30a319b79d8d69 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 5 Jan 2006 22:02:14 +0000 Subject: [PATCH] More subtle exception fixes for C# and Java. Workarournd for the wrong std_except.i file is being %include'd from java/stl.i and csharp/stl.i. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8222 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/std_except.i | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/std_except.i b/Lib/std_except.i index de7cac9f5..a784e0206 100644 --- a/Lib/std_except.i +++ b/Lib/std_except.i @@ -1,3 +1,9 @@ +#if defined(SWIGJAVA) +%include +#elif defined(SWIGCSHARP) +%include +#else + %include // Typemaps used by the STL wrappers that throw exceptions. @@ -20,7 +26,7 @@ %exceptionclass Exception; #if !defined(SWIG_STD_EXCEPTIONS_AS_CLASSES) %typemap(throws,noblock=1) Exception { - SWIG_exception(Code, $1.what()); + SWIG_exception(Code, $1.what()) } %ignore Exception; struct Exception { @@ -42,4 +48,5 @@ namespace std { %std_exception_map(underflow_error, SWIG_OverflowError); } +#endif