diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-21 04:52:47 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-21 04:52:47 +0000 |
| commit | 001582371ed0533332255b36169a73f9c110d3bf (patch) | |
| tree | 3565e81ac1555c07a853a5760dd32d4fb07225dd | |
| parent | 2593723b11dd69b46a5e75dd2218e6217aa244b5 (diff) | |
| download | ATCD-001582371ed0533332255b36169a73f9c110d3bf.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 4458094de7f..c61eeac2de3 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -406,6 +406,11 @@ TAO_CodeGen::start_server_header (const char *fname) << "\"\n"; } + // The server header should include the client header. + *this->server_header_ << "\n#include \"" + << be_global->be_get_client_hdr_fname (1) + << "\""; + // We must include all the skeleton headers corresponding to // IDL files included by the current IDL file. // We will use the included IDL file names as they appeared @@ -427,11 +432,6 @@ TAO_CodeGen::start_server_header (const char *fname) server_hdr); } - // The server header should include the client header. - *this->server_header_ << "\n#include \"" - << be_global->be_get_client_hdr_fname (1) - << "\""; - // Some compilers don't optimize the #ifndef header include // protection, but do optimize based on #pragma once. *this->server_header_ << "\n\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n" @@ -454,12 +454,17 @@ TAO_CodeGen::start_server_header (const char *fname) } this->gen_standard_include (this->server_header_, - "tao/Collocation_Proxy_Broker.h"); - this->gen_standard_include (this->server_header_, "tao/PortableServer/PortableServer.h"); this->gen_standard_include (this->server_header_, "tao/PortableServer/Servant_Base.h"); + if (be_global->gen_thru_poa_collocation () + || be_global->gen_direct_collocation ()) + { + this->gen_standard_include (this->server_header_, + "tao/Collocation_Proxy_Broker.h"); + } + if (be_global->gen_amh_classes ()) { this->gen_standard_include (this->server_header_, |