Fix potential name clashes with symbols in the Director class

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12062 626c5289-ae23-0410-ae9c-e8d60b6d4f22

1 files changed, 8 insertions, 8 deletions

diff --git a/Lib/ruby/director.swg b/Lib/ruby/director.swg
index cdc4baea1..9807b11bb 100644
--- a/Lib/ruby/director.swg
+++ b/Lib/ruby/director.swg
@@ -327,8 +327,8 @@ namespace Swig {
 
   /* ownership management */
   private:
-    typedef std::map<void*, GCItem_var> ownership_map;
-    mutable ownership_map owner;
+    typedef std::map<void*, GCItem_var> swig_ownership_map;
+    mutable swig_ownership_map swig_owner;
 #ifdef __PTHREAD__
     static pthread_mutex_t swig_mutex_own;
 #endif
@@ -339,7 +339,7 @@ namespace Swig {
     {
       if (vptr) {
 	SWIG_GUARD(swig_mutex_own);
-	owner[vptr] = new GCArray_T<Type>(vptr);
+	swig_owner[vptr] = new GCArray_T<Type>(vptr);
       }
     }
     
@@ -348,7 +348,7 @@ namespace Swig {
     {
       if (vptr) {	
 	SWIG_GUARD(swig_mutex_own);
-	owner[vptr] = new GCItem_T<Type>(vptr);
+	swig_owner[vptr] = new GCItem_T<Type>(vptr);
       }
     }
 
@@ -356,7 +356,7 @@ namespace Swig {
     {
       if (vptr && own) {
 	SWIG_GUARD(swig_mutex_own);
-	owner[vptr] = new GCItem_Object(own);
+	swig_owner[vptr] = new GCItem_Object(own);
       }
     }
     
@@ -365,10 +365,10 @@ namespace Swig {
       ruby_owntype own = 0;
       if (vptr) {
 	SWIG_GUARD(swig_mutex_own);
-	ownership_map::iterator iter = owner.find(vptr);
-	if (iter != owner.end()) {
+	swig_ownership_map::iterator iter = swig_owner.find(vptr);
+	if (iter != swig_owner.end()) {
 	  own = iter->second->get_own();
-	  owner.erase(iter);
+	  swig_owner.erase(iter);
 	}
       }
       return own;