jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix potential name clash in director class

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12501 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2011-02-20 13:47:14 +00:00
commit 0a5ca9ccd6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/python/director.swg
View file

@ -404,11 +404,11 @@ namespace Swig {
} }
/* methods to implement pseudo protected director members */ /* methods to implement pseudo protected director members */
virtual bool swig_get_inner(const char* /* protected_method_name */) const { virtual bool swig_get_inner(const char* /* swig_protected_method_name */) const {
return true; return true;
} }
virtual void swig_set_inner(const char* /* protected_method_name */, bool /* val */) const { virtual void swig_set_inner(const char* /* swig_protected_method_name */, bool /* swig_val */) const {
} }
/* ownership management */ /* ownership management */

8
Source/Modules/python.cxx
View file

@ -2721,13 +2721,13 @@ public:
Printf(f_directors_h, "\n\n"); Printf(f_directors_h, "\n\n");
Printf(f_directors_h, "/* Internal Director utilities */\n"); Printf(f_directors_h, "/* Internal Director utilities */\n");
Printf(f_directors_h, "public:\n"); Printf(f_directors_h, "public:\n");
Printf(f_directors_h, " bool swig_get_inner(const char* protected_method_name) const {\n"); Printf(f_directors_h, " bool swig_get_inner(const char* swig_protected_method_name) const {\n");
Printf(f_directors_h, " std::map<std::string, bool>::const_iterator iv = swig_inner.find(protected_method_name);\n"); Printf(f_directors_h, " std::map<std::string, bool>::const_iterator iv = swig_inner.find(swig_protected_method_name);\n");
Printf(f_directors_h, " return (iv != swig_inner.end() ? iv->second : false);\n"); Printf(f_directors_h, " return (iv != swig_inner.end() ? iv->second : false);\n");
Printf(f_directors_h, " }\n\n"); Printf(f_directors_h, " }\n\n");
Printf(f_directors_h, " void swig_set_inner(const char* protected_method_name, bool val) const\n"); Printf(f_directors_h, " void swig_set_inner(const char* swig_protected_method_name, bool swig_val) const\n");
Printf(f_directors_h, " { swig_inner[protected_method_name] = val;}\n\n"); Printf(f_directors_h, " { swig_inner[swig_protected_method_name] = swig_val;}\n\n");
Printf(f_directors_h, "private:\n"); Printf(f_directors_h, "private:\n");
Printf(f_directors_h, " mutable std::map<std::string, bool> swig_inner;\n"); Printf(f_directors_h, " mutable std::map<std::string, bool> swig_inner;\n");