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

Fix issue with using directors with the nspace feature without the -package commandline argument.

Browse source
This commit is contained in:
Brant K. Kyser 2013-01-14 16:31:53 -06:00 • committed by William S Fulton
commit ace33bbf41
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Modules/java.cxx
View file

@ -1930,9 +1930,10 @@ public:
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
} else { } else {
if (package) { if (package)
full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name); full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name);
} else
full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name);
} }
if (!addSymbol(proxy_class_name, n, nspace)) if (!addSymbol(proxy_class_name, n, nspace))
@ -3592,8 +3593,11 @@ public:
String *qualified_classname = Copy(classname); String *qualified_classname = Copy(classname);
String *nspace = getNSpace(); String *nspace = getNSpace();
if (nspace) if (nspace && package)
Insert(qualified_classname, 0, NewStringf("%s.%s.", package, nspace)); Insert(qualified_classname, 0, NewStringf("%s.%s.", package, nspace));
else if(nspace)
Insert(qualified_classname, 0, NewStringf("%s.", nspace));
// Kludge Alert: functionWrapper sets sym:overload properly, but it // Kludge Alert: functionWrapper sets sym:overload properly, but it
// isn't at this point, so we have to manufacture it ourselves. At least // isn't at this point, so we have to manufacture it ourselves. At least