diff --git a/Lib/php/director.swg b/Lib/php/director.swg index 5c1d8d08f..163cd7fb6 100644 --- a/Lib/php/director.swg +++ b/Lib/php/director.swg @@ -100,19 +100,19 @@ namespace Swig { class Director { protected: zval *swig_self; - typedef std::map ownership_map; - mutable ownership_map owner; + typedef std::map swig_ownership_map; + mutable swig_ownership_map swig_owner; public: Director(zval* self) : swig_self(self) { } ~Director() { - for (ownership_map::iterator i = owner.begin(); i != owner.end(); i++) { - owner.erase(i); + for (swig_ownership_map::iterator i = swig_owner.begin(); i != swig_owner.end(); i++) { + swig_owner.erase(i); } } - bool is_overriden_method(char *cname, char *lc_fname) { + bool swig_is_overridden_method(char *cname, char *lc_fname) { zval classname; zend_class_entry **ce; zend_function *mptr; @@ -133,7 +133,7 @@ namespace Swig { void swig_acquire_ownership(Type *vptr) const { if (vptr) { - owner[vptr] = new GCItem_T(vptr); + swig_owner[vptr] = new GCItem_T(vptr); } } }; diff --git a/Lib/python/director.swg b/Lib/python/director.swg index 8514365a9..fcd174711 100644 --- a/Lib/python/director.swg +++ b/Lib/python/director.swg @@ -404,17 +404,17 @@ namespace Swig { } /* methods to implement pseudo protected director members */ - virtual bool swig_get_inner(const char* /* name */) const { + virtual bool swig_get_inner(const char* /* protected_method_name */) const { return true; } - virtual void swig_set_inner(const char* /* name */, bool /* val */) const { + virtual void swig_set_inner(const char* /* protected_method_name */, bool /* val */) const { } /* ownership management */ private: - typedef std::map ownership_map; - mutable ownership_map owner; + typedef std::map swig_ownership_map; + mutable swig_ownership_map swig_owner; #ifdef __THREAD__ static PyThread_type_lock swig_mutex_own; #endif @@ -425,7 +425,7 @@ namespace Swig { { if (vptr) { SWIG_GUARD(swig_mutex_own); - owner[vptr] = new GCArray_T(vptr); + swig_owner[vptr] = new GCArray_T(vptr); } } @@ -434,7 +434,7 @@ namespace Swig { { if (vptr) { SWIG_GUARD(swig_mutex_own); - owner[vptr] = new GCItem_T(vptr); + swig_owner[vptr] = new GCItem_T(vptr); } } @@ -442,7 +442,7 @@ namespace Swig { { if (vptr && own) { SWIG_GUARD(swig_mutex_own); - owner[vptr] = new GCItem_Object(own); + swig_owner[vptr] = new GCItem_Object(own); } } @@ -451,10 +451,10 @@ namespace Swig { int 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; 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 ownership_map; - mutable ownership_map owner; + typedef std::map 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(vptr); + swig_owner[vptr] = new GCArray_T(vptr); } } @@ -348,7 +348,7 @@ namespace Swig { { if (vptr) { SWIG_GUARD(swig_mutex_own); - owner[vptr] = new GCItem_T(vptr); + swig_owner[vptr] = new GCItem_T(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; diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index c6f01c3e3..bd751f767 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -799,7 +799,7 @@ public: Wrapper_add_local(f, "director", "Swig::Director *director = 0"); Printf(f->code, "director = dynamic_cast(arg1);\n"); Wrapper_add_local(f, "upcall", "bool upcall = false"); - Printf(f->code, "upcall = !director->is_overriden_method((char *)\"%s\", (char *)\"%s\");\n", + Printf(f->code, "upcall = !director->swig_is_overridden_method((char *)\"%s\", (char *)\"%s\");\n", Swig_class_name(Swig_methodclass(n)), name); } diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 93679084c..42a6b234f 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -2721,15 +2721,15 @@ public: Printf(f_directors_h, "\n\n"); Printf(f_directors_h, "/* Internal Director utilities */\n"); Printf(f_directors_h, "public:\n"); - Printf(f_directors_h, " bool swig_get_inner(const char* name) const {\n"); - Printf(f_directors_h, " std::map::const_iterator iv = inner.find(name);\n"); - Printf(f_directors_h, " return (iv != inner.end() ? iv->second : false);\n"); + Printf(f_directors_h, " bool swig_get_inner(const char* protected_method_name) const {\n"); + Printf(f_directors_h, " std::map::const_iterator iv = swig_inner.find(protected_method_name);\n"); + Printf(f_directors_h, " return (iv != swig_inner.end() ? iv->second : false);\n"); Printf(f_directors_h, " }\n\n"); - Printf(f_directors_h, " void swig_set_inner(const char* name, bool val) const\n"); - Printf(f_directors_h, " { inner[name] = val;}\n\n"); + Printf(f_directors_h, " void swig_set_inner(const char* protected_method_name, bool val) const\n"); + Printf(f_directors_h, " { swig_inner[protected_method_name] = val;}\n\n"); Printf(f_directors_h, "private:\n"); - Printf(f_directors_h, " mutable std::map inner;\n"); + Printf(f_directors_h, " mutable std::map swig_inner;\n"); } if (director_method_index) {