From 9f714ec92a3fb705a0379aa6a2fe380b8df853e0 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 21 Mar 2012 20:58:04 +0000 Subject: [PATCH] Correct definitions of %$isglobal and %$classname for %rename matching, although I can't get %$classname nor %$innamespace working (both use $parentNode) git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12944 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ Lib/swig.swg | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 976f8882a..ae3f52d76 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.5 (in progress) =========================== +2012-03-21: wsfulton + Fix #3494791 - %$isglobal for %rename matching. + 2012-03-20: wsfulton Fix #3487706 and #3391906 - missing stddef.h include for ptrdiff_t when using %import for STL containers and compiling with g++-4.6. An include of stddef.h is now only diff --git a/Lib/swig.swg b/Lib/swig.swg index a6fef0257..b47d4ff2c 100644 --- a/Lib/swig.swg +++ b/Lib/swig.swg @@ -291,7 +291,7 @@ static int NAME(TYPE x) { %define %$isextern "match$storage"="extern" %enddef %define %$ismember "match$ismember"="1" %enddef -%define %$isglobal %not %ismember %enddef +%define %$isglobal %$not %$ismember %enddef %define %$innamespace "match$parentNode$nodeType"="namespace" %enddef %define %$ispublic "match$access"="public" %enddef @@ -301,7 +301,7 @@ static int NAME(TYPE x) { %define %$ismemberget "match$memberget"="1" %enddef %define %$ismemberset "match$memberset"="1" %enddef -%define %$classname %ismember,match$parentNode$name %enddef +%define %$classname %$ismember,"match$parentNode$name" %enddef /* ----------------------------------------------------------------------------- * Include all the warnings labels and macros