Fixed %apply merging problem.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@912 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
d4acefff51
commit
69d1af33d8
1 changed files with 1 additions and 1 deletions
|
|
@ -192,7 +192,7 @@ Swig_typemap_clear(char *op, SwigType *type, String_or_char *name) {
|
||||||
static void merge_attributes(Hash *target, Hash *source) {
|
static void merge_attributes(Hash *target, Hash *source) {
|
||||||
String *key;
|
String *key;
|
||||||
for (key = Firstkey(source); key; key = Nextkey(source)) {
|
for (key = Firstkey(source); key; key = Nextkey(source)) {
|
||||||
if (Getattr(target,key)) continue;
|
/* if (Getattr(target,key)) continue; */
|
||||||
Setattr(target,key,Getattr(source,key));
|
Setattr(target,key,Getattr(source,key));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue