jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix multiple definitions of 'ExceptionMatches' when using directors and multiple modules.

Browse source 
Java problem, closes #353 and closes #355.
This commit is contained in:
William S Fulton 2015-04-11 22:51:29 +01:00
commit 25b48b85ec
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.6 (in progress) Version 3.0.6 (in progress)
=========================== ===========================
2015-04-11: wsfulton
[Java] Fix #353 - Linker multiple definition of 'ExceptionMatches' when
using directors and multiple modules.
2015-04-11: wsfulton 2015-04-11: wsfulton
Merge #320 - Make __dict__ accessible for Python builtin classes. Merge #320 - Make __dict__ accessible for Python builtin classes.

2
Lib/java/director.swg
View file

@ -367,7 +367,7 @@ namespace Swig {
}; };
// Helper method to determine if a Java throwable matches a particular Java class type // Helper method to determine if a Java throwable matches a particular Java class type
bool ExceptionMatches(JNIEnv *jenv, jthrowable throwable, const char *classname) { SWIGINTERN bool ExceptionMatches(JNIEnv *jenv, jthrowable throwable, const char *classname) {
bool matches = false; bool matches = false;
if (throwable && jenv && classname) { if (throwable && jenv && classname) {