mirror of https://github.com/swig/swig
Merge branch 'part3'
* part3: Correct initialization order in Language Remove redundant initialization code
This commit is contained in:
commit
b354e5b871
|
@ -363,6 +363,8 @@ Language::Language():
|
|||
none_comparison(NewString("$arg != 0")),
|
||||
director_ctor_code(NewString("")),
|
||||
director_prot_ctor_code(0),
|
||||
director_multiple_inheritance(1),
|
||||
doxygenTranslator(NULL),
|
||||
symtabs(NewHash()),
|
||||
overloading(0),
|
||||
multiinput(0),
|
||||
|
@ -374,16 +376,8 @@ cplus_runtime(0) {
|
|||
/* Default director constructor code, passed to Swig_ConstructorToFunction */
|
||||
Printv(director_ctor_code, "if ( $comparison ) { /* subclassed */\n", " $director_new \n", "} else {\n", " $nondirector_new \n", "}\n", NIL);
|
||||
|
||||
/*
|
||||
Default director 'protected' constructor code, disabled by
|
||||
default. Each language that needs it, has to define it.
|
||||
*/
|
||||
director_prot_ctor_code = 0;
|
||||
director_multiple_inheritance = 1;
|
||||
assert(!this_);
|
||||
this_ = this;
|
||||
|
||||
doxygenTranslator = NULL;
|
||||
}
|
||||
|
||||
Language::~Language() {
|
||||
|
|
|
@ -118,7 +118,7 @@ static int have_operators = 0;
|
|||
class PERL5:public Language {
|
||||
public:
|
||||
|
||||
PERL5():Language () {
|
||||
PERL5() {
|
||||
Clear(argc_template_string);
|
||||
Printv(argc_template_string, "items", NIL);
|
||||
Clear(argv_template_string);
|
||||
|
|
|
@ -333,7 +333,8 @@ protected:
|
|||
/* Director constructor "template" code */
|
||||
String *director_ctor_code;
|
||||
|
||||
/* Director 'protected' constructor "template" code */
|
||||
/* Director 'protected' constructor "template" code, disabled by
|
||||
default. Each language that needs it, has to define it. */
|
||||
String *director_prot_ctor_code;
|
||||
|
||||
/* Director allows multiple inheritance */
|
||||
|
|
Loading…
Reference in New Issue