diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-02-21 19:28:03 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-02-21 19:28:03 +0000 |
| commit | e46d2b5dc6575abc8f0c0aef92c138bdc5dcac13 (patch) | |
| tree | 10a22c230d420b293610b5d0a9da139ec1f9902b /TAO/TAO_IDL/be/be_interface.cpp | |
| parent | 486e232ae8f284386802910eb914e7734c43fee1 (diff) | |
| download | ATCD-e46d2b5dc6575abc8f0c0aef92c138bdc5dcac13.tar.gz | |
Thu Feb 21 19:25:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/TAO_IDL/be/be_interface.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index d3613e446eb..628305ae9e5 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -571,12 +571,11 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) << ")" << be_uidt; } - int status = + int const status = this->traverse_inheritance_graph ( be_interface::gen_abstract_init_helper, os, - true - ); + true); if (status == -1) { @@ -601,13 +600,20 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) *os << "::CORBA::Object (objref, _tao_collocated, servant, oc)"; } - *os << "," << be_nl - << "the"<< this->base_proxy_broker_name () << "_ (0)" - << be_uidt << be_uidt; + if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ()) + { + *os << "," << be_nl + << "the"<< this->base_proxy_broker_name () << "_ (0)" + << be_uidt << be_uidt; + } + + *os << be_nl << "{" << be_idt_nl; - *os << be_nl << "{" << be_idt_nl - << "this->" << this->flat_name () - << "_setup_collocation ();"; + if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ()) + { + *os << "this->" << this->flat_name () + << "_setup_collocation ();"; + } if (this->is_abstract ()) { @@ -1859,7 +1865,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) if (result != -1) { result = process.spawn (process_options); - + // Spawn a process for gperf. if (result == -1) { @@ -1873,7 +1879,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) { ACE_exitcode exitcode; result = process.wait (&exitcode); - + if (result == -1) { ACE_ERROR ((LM_ERROR, |