From d801875576c2304672640ac70ab1b8a84066750f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 4 Oct 2005 20:36:09 +0000 Subject: [PATCH] Modify following features to work as flags, so that they can be truely set and unset: novaluewrapper git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7588 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Source/Swig/typesys.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/SWIG/Source/Swig/typesys.c b/SWIG/Source/Swig/typesys.c index c96c19e3a..757ba5c0b 100644 --- a/SWIG/Source/Swig/typesys.c +++ b/SWIG/Source/Swig/typesys.c @@ -1282,9 +1282,8 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) { } else { if ((Strcmp(nodeType(n),"class") == 0) && (!Getattr(n,"allocate:default_constructor") - || (Getattr(n,"allocate:noassign")))) { - use_wrapper = !Getattr(n,"feature:novaluewrapper") - || GetFlag(n,"feature:nodefault"); + || (Getattr(n,"allocate:noassign")))) { + use_wrapper = !GetFlag(n,"feature:novaluewrapper") || GetFlag(n,"feature:nodefault"); } } } else { @@ -1311,9 +1310,9 @@ SwigType *SwigType_alttype(SwigType *t, int local_tmap) { if (SwigType_type(td) == T_USER) { if ((n = Swig_symbol_clookup(td,0))) { if (((Strcmp(nodeType(n),"class") == 0) - && !Getattr(n,"allocate:noassign") - && (Getattr(n,"allocate:default_constructor"))) - || (Getattr(n,"feature:novaluewrapper"))) { + && !Getattr(n,"allocate:noassign") + && (Getattr(n,"allocate:default_constructor"))) + || (GetFlag(n,"feature:novaluewrapper"))) { use_wrapper = GetFlag(n,"feature:valuewrapper"); } }