Mercurial > projects > qtd
changeset 223:0c7abb1e6a9d
windows fix, again
author | eldar |
---|---|
date | Wed, 15 Jul 2009 08:33:42 +0000 |
parents | c9670583880e |
children | 7f150ad4cb5f |
files | generator/dgenerator.cpp |
diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/generator/dgenerator.cpp Tue Jul 14 22:14:00 2009 +0000 +++ b/generator/dgenerator.cpp Wed Jul 15 08:33:42 2009 +0000 @@ -2277,7 +2277,11 @@ s << "(void* native_id, bool no_real_delete = false) {" << endl << INDENT << "super(native_id, no_real_delete);" << endl; } - + if (cpp_shared) { + if (d_class->generateShellClass() && !d_class->isInterface()) + s << INDENT << "if (!init_flag_" << d_class->name() << ")" << endl + << INDENT << " static_init_" << d_class->name() << "();" << endl << endl; + } // customized store-result instances d_funcs = d_class->functionsInTargetLang(); for (int i=0; i<d_funcs.size(); ++i) { @@ -2425,7 +2429,7 @@ { Indentation indent(INDENT); s << INDENT << "public this(void* native_id, bool no_real_delete = true) {" << endl - << INDENT << " super(native_id, no_real_delete);" << endl; + << INDENT << " super(native_id, no_real_delete);" << endl; @@ -3232,11 +3236,7 @@ { Indentation indent(INDENT); bool shellClass = d_function->ownerClass()->generateShellClass(); - if (cpp_shared) { - if (shellClass && !d_function->ownerClass()->isInterface()) - s << INDENT << "if (!init_flag_" << d_function->ownerClass()->name() << ")" << endl - << INDENT << " static_init_" << d_function->ownerClass()->name() << "();" << endl << endl; - } + writeJavaCallThroughContents(s, d_function); // Write out expense checks if present...