From 6c190feed47b1899455fbcd877a009ce01a4b86d Mon Sep 17 00:00:00 2001 From: Dave Beazley Date: Sat, 26 Feb 2000 21:45:59 +0000 Subject: [PATCH] Removed dependence on SWIG1.1/symbol.cxx git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@276 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Source/Modules1.1/perl5.cxx | 10 ++++++---- SWIG/Source/Modules1.1/pycpp.cxx | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/SWIG/Source/Modules1.1/perl5.cxx b/SWIG/Source/Modules1.1/perl5.cxx index cc4133684..9913b74c5 100644 --- a/SWIG/Source/Modules1.1/perl5.cxx +++ b/SWIG/Source/Modules1.1/perl5.cxx @@ -104,6 +104,8 @@ static char *import_file = 0; static char *smodule = 0; static int compat = 0; +static Hash symbols; + // --------------------------------------------------------------------- // PERL5::parse_args(int argc, char *argv[]) // @@ -1791,7 +1793,7 @@ void PERL5::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) { realname = iname; cname << class_name << "::" << realname; - if (add_symbol(cname.get(),0,0)) { + if ((symbols.add(cname.get(),0)) == -1) { return; // Forget it, we saw this function already } @@ -1915,7 +1917,7 @@ void PERL5::cpp_variable(char *name, char *iname, DataType *t) { if (blessed) { cname << class_name << "::" << realname; - if (add_symbol(cname.get(),0,0)) { + if ((symbols.add(cname.get(),0)) == -1) { return; // Forget it, we saw this already } @@ -1968,7 +1970,7 @@ void PERL5::cpp_constructor(char *name, char *iname, ParmList *l) { } cname << class_name << "::" << realname; - if (add_symbol(cname.get(),0,0)) { + if ((symbols.add(cname.get(),0)) == -1) { return; // Forget it, we saw this already } if ((strcmp(realname,class_name) == 0) || ((!iname) && (ObjCClass)) ){ @@ -2137,7 +2139,7 @@ void PERL5::cpp_declare_const(char *name, char *iname, DataType *type, char *val realname = iname; cname << class_name << "::" << realname; - if (add_symbol(cname.get(),0,0)) { + if ((symbols.add(cname.get(),0)) == -1) { return; // Forget it, we saw this already } diff --git a/SWIG/Source/Modules1.1/pycpp.cxx b/SWIG/Source/Modules1.1/pycpp.cxx index dedfcef96..4e80f8e16 100644 --- a/SWIG/Source/Modules1.1/pycpp.cxx +++ b/SWIG/Source/Modules1.1/pycpp.cxx @@ -50,6 +50,8 @@ static String base_getattr; static String base_setattr; static int class_renamed = 0; +static Hash symbols; + // -------------------------------------------------------------------------- // PYTHON::cpp_open_class(char *classname, char *rname, char *ctype, int strip) // @@ -151,7 +153,7 @@ void PYTHON::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) // Check to see if we've already seen this cname << class_name << "::" << realname; - if (add_symbol(cname.get(), 0,0)) { + if ((symbols.add(cname.get(),0)) == -1) { return; // Forget it, already saw it } @@ -228,7 +230,7 @@ void PYTHON::cpp_constructor(char *name, char *iname, ParmList *l) { // Check to see if we've already seen this cname << class_name << "::" << realname; - if (add_symbol(cname.get(), 0,0)) { + if ((symbols.add(cname.get(), 0)) == -1) { return; // Forget it, already seen it } @@ -437,7 +439,7 @@ void PYTHON::cpp_variable(char *name, char *iname, DataType *t) { // Check to see if we've already seen this cname << class_name << "::" << realname; - if (add_symbol(cname.get(), 0,0)) { + if ((symbols.add(cname.get(), 0)) == -1) { return; // Forget it, already seen it } @@ -486,7 +488,7 @@ void PYTHON::cpp_declare_const(char *name, char *iname, DataType *type, char *va // Check to see if we've already seen this cname << class_name << "::" << realname; - if (add_symbol(cname.get(), 0,0)) { + if ((symbols.add(cname.get(), 0)) == -1) { return; // Forget it, already seen it }