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

Merge in upstream changes

Browse source
This commit is contained in:
Brant K. Kyser 2013-01-05 02:25:15 -06:00
commit 54b576d8b2
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -2,6 +2,9 @@
*.o *.o
*.class *.class
# Editor junk
*.sw?
# Local PCRE # Local PCRE
prce pcre
*.gz *.gz

9
CHANGES.current
View file

@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.10 (in progress) Version 2.0.10 (in progress)
============================ ============================
2013-01-03: wsfulton 2013-01-04: wsfulton
Pull patch from BrantKyser to fix directors and nspace feature when multilevel namespaces are used. [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction
with directors.
2013-01-03: wsfulton
[Java] Pull patch #1 from BrantKyser to fix SF Bug #1278 - fix directors and nspace feature when
multilevel namespaces are used.

2
Source/Modules/java.cxx
View file

@ -3383,7 +3383,7 @@ public:
Printf(code_wrap->code, " // raw pointer alive. This is done instead of using the smart pointer's dynamic cast\n"); Printf(code_wrap->code, " // raw pointer alive. This is done instead of using the smart pointer's dynamic cast\n");
Printf(code_wrap->code, " // feature since different smart pointer implementations have differently named dynamic\n"); Printf(code_wrap->code, " // feature since different smart pointer implementations have differently named dynamic\n");
Printf(code_wrap->code, " // cast mechanisms.\n"); Printf(code_wrap->code, " // cast mechanisms.\n");
Printf(code_wrap->code, " %s *director = dynamic_cast< %s *>(obj->operator->());\n", dirClassName, dirClassName); Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj->operator->());\n", dirClassName, dirClassName);
} }
else { else {
Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name);