From 5bcfc81c12f6cc081da5519fed9664735ab77405 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 27 May 2010 20:59:29 +0000 Subject: [PATCH] Fix potential name clashes with symbols in the Director class git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12063 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/octrun.swg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index 8013dcb6e..5b90d91b3 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -1132,24 +1132,24 @@ namespace Swig { namespace Swig { class Director { octave_swig_type *self; - bool disowned; + bool swig_disowned; Director(const Director &x); Director &operator=(const Director &rhs); public: - Director(void *vptr):self(0), disowned(false) { + Director(void *vptr):self(0), swig_disowned(false) { set_rtdir(vptr, this); } ~Director() { swig_director_destroyed(self, this); - if (disowned) + if (swig_disowned) self->decref(); } void swig_set_self(octave_swig_type *new_self) { - assert(!disowned); + assert(!swig_disowned); self = new_self; } @@ -1158,9 +1158,9 @@ namespace Swig { } void swig_disown() { - if (disowned) + if (swig_disowned) return; - disowned = true; + swig_disowned = true; self->incref(); } };