diff options
| author | Brant K. Kyser <brantkyser@gmail.com> | 2013-01-05 02:25:15 -0600 |
|---|---|---|
| committer | Brant K. Kyser <brantkyser@gmail.com> | 2013-01-05 02:26:15 -0600 |
| commit | 54b576d8b2b71f55cffb0f4b882f9331f487c3c2 (patch) | |
| tree | de2b24ce1b0e0227b8e9cc152fca05555dee1110 | |
| parent | 747b50e2d7f43c73214867c9821dccef786b3107 (diff) | |
| parent | fade4f1b943b17ba454dfe12d4b407ed5e0f7efe (diff) | |
| download | swig-54b576d8b2b71f55cffb0f4b882f9331f487c3c2.tar.gz | |
Merge in upstream changes
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | CHANGES.current | 7 | ||||
| -rw-r--r-- | Source/Modules/java.cxx | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index d4ac5207b..6f2af0b00 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.o *.class +# Editor junk +*.sw? + # Local PCRE -prce +pcre *.gz diff --git a/CHANGES.current b/CHANGES.current index a043d3348..515387120 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-04: wsfulton + [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction + with directors. + 2013-01-03: wsfulton - Pull patch from BrantKyser to fix directors and nspace feature when multilevel namespaces are used. + [Java] Pull patch #1 from BrantKyser to fix SF Bug #1278 - fix directors and nspace feature when + multilevel namespaces are used. diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 45161b9d9..28d8b88aa 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -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, " // feature since different smart pointer implementations have differently named dynamic\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 { Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); |