diff --git a/SWIG/Source/Modules/java.cxx b/SWIG/Source/Modules/java.cxx index 57121f350..bb88e9512 100644 --- a/SWIG/Source/Modules/java.cxx +++ b/SWIG/Source/Modules/java.cxx @@ -149,6 +149,10 @@ class JAVA : public Language { n_directors(0), 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; } /* ----------------------------------------------------------------------------- diff --git a/SWIG/Source/Modules/ocaml.cxx b/SWIG/Source/Modules/ocaml.cxx index 0c0439c97..d47e368be 100755 --- a/SWIG/Source/Modules/ocaml.cxx +++ b/SWIG/Source/Modules/ocaml.cxx @@ -77,6 +77,8 @@ public: "} else {\n", " failwith(\"accessing abstract class or protected constructor\"); \n", "}\n", NIL); + director_multiple_inheritance = 1; + director_language = 1; } diff --git a/SWIG/Source/Modules/python.cxx b/SWIG/Source/Modules/python.cxx index 16721d746..d27ee5295 100644 --- a/SWIG/Source/Modules/python.cxx +++ b/SWIG/Source/Modules/python.cxx @@ -94,6 +94,8 @@ public: " \"accessing abstract class or protected constructor\"); \n", " SWIG_fail;\n", "}\n", NIL); + director_multiple_inheritance = 1; + director_language = 1; } /* ------------------------------------------------------------ diff --git a/SWIG/Source/Modules/ruby.cxx b/SWIG/Source/Modules/ruby.cxx index 3a9c99faa..e7cff931c 100644 --- a/SWIG/Source/Modules/ruby.cxx +++ b/SWIG/Source/Modules/ruby.cxx @@ -195,6 +195,8 @@ public: " rb_raise(rb_eRuntimeError,\"accessing abstract class or protected constructor\"); \n", " return Qnil;\n", "}\n", NIL); + director_multiple_inheritance = 0; + director_language = 1; } /* --------------------------------------------------------------------- @@ -226,6 +228,7 @@ public: Swig_mark_arg(i); } else if (strcmp(argv[i],"-minherit") == 0) { multipleInheritance = true; + director_multiple_inheritance = 1; Swig_mark_arg(i); } else if (strcmp(argv[i],"-prefix") == 0) { if (argv[i+1]) { @@ -354,6 +357,7 @@ public: } if (Getattr(options, "ruby_minherit")) { multipleInheritance = true; + director_multiple_inheritance = 1; } } }