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

support/ignore multi-inheritance directors

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6735 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-11-15 22:52:38 +00:00
commit f678d1eed0
4 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SWIG/Source/Modules/java.cxx
View file

@ -149,6 +149,10 @@ class JAVA : public Language {
n_directors(0), n_directors(0),
emitted_connect(false) emitted_connect(false)
{ {
/* by now, multiple inheritance in directors is disabled, this
should be easy to implement though */
director_multiple_inheritance = 0;
director_language = 1;
} }
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------

2
SWIG/Source/Modules/ocaml.cxx
View file

@ -77,6 +77,8 @@ public:
"} else {\n", "} else {\n",
" failwith(\"accessing abstract class or protected constructor\"); \n", " failwith(\"accessing abstract class or protected constructor\"); \n",
"}\n", NIL); "}\n", NIL);
director_multiple_inheritance = 1;
director_language = 1;
} }

2
SWIG/Source/Modules/python.cxx
View file

@ -94,6 +94,8 @@ public:
" \"accessing abstract class or protected constructor\"); \n", " \"accessing abstract class or protected constructor\"); \n",
" SWIG_fail;\n", " SWIG_fail;\n",
"}\n", NIL); "}\n", NIL);
director_multiple_inheritance = 1;
director_language = 1;
} }
/* ------------------------------------------------------------ /* ------------------------------------------------------------

4
SWIG/Source/Modules/ruby.cxx
View file

@ -195,6 +195,8 @@ public:
" rb_raise(rb_eRuntimeError,\"accessing abstract class or protected constructor\"); \n", " rb_raise(rb_eRuntimeError,\"accessing abstract class or protected constructor\"); \n",
" return Qnil;\n", " return Qnil;\n",
"}\n", NIL); "}\n", NIL);
director_multiple_inheritance = 0;
director_language = 1;
} }
/* --------------------------------------------------------------------- /* ---------------------------------------------------------------------
@ -226,6 +228,7 @@ public:
Swig_mark_arg(i); Swig_mark_arg(i);
} else if (strcmp(argv[i],"-minherit") == 0) { } else if (strcmp(argv[i],"-minherit") == 0) {
multipleInheritance = true; multipleInheritance = true;
director_multiple_inheritance = 1;
Swig_mark_arg(i); Swig_mark_arg(i);
} else if (strcmp(argv[i],"-prefix") == 0) { } else if (strcmp(argv[i],"-prefix") == 0) {
if (argv[i+1]) { if (argv[i+1]) {
@ -354,6 +357,7 @@ public:
} }
if (Getattr(options, "ruby_minherit")) { if (Getattr(options, "ruby_minherit")) {
multipleInheritance = true; multipleInheritance = true;
director_multiple_inheritance = 1;
} }
} }
} }