fixed keyword_rename.ctest tese case, caused by a mistake in Swig/naming.c

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10519 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Haoyu Bai 2008-06-07 13:40:51 +00:00
commit 32617f7804
3 changed files with 6 additions and 2 deletions

View file

@ -1,6 +1,10 @@
Version 1.3.36 (in progress)
=============================
06/07/2008: bhy
Added test case keyword_rename, then made the keyword renaming works properly
by fixing Swig_name_make() for a incomplete condition checking.
06/02/2008: wsfulton
[Java, C#] Fix enum wrappers when using -noproxy.

View file

@ -3,7 +3,7 @@
*/
%module keyword_rename
%warnfilter(SWIGWARN_PARSE_KEYWORD);
%inline %{
#define KW(x, y) int x (int y) { return y;}

View file

@ -1477,7 +1477,7 @@ String *Swig_name_make(Node *n, String *prefix, String_or_char *cname, SwigType
}
if (rename_hash || rename_list) {
if (rename_hash || rename_list || namewarn_hash || namewarn_list) {
Hash *rn = Swig_name_object_get(Swig_name_rename_hash(), prefix, name, decl);
if (!rn || !Swig_name_match_nameobj(rn, n)) {
rn = Swig_name_nameobj_lget(Swig_name_rename_list(), n, prefix, name, decl);