diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-16 18:57:14 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-16 18:57:14 +0000 |
| commit | 1e040d9c86b71264307971f27e2cecb2a4d17d94 (patch) | |
| tree | 1bc8b6ea3ee5d210461e57ff11360006686f1230 | |
| parent | c485620da2b7d7de3296a01ea1e661e0b34dbc47 (diff) | |
| download | ATCD-1e040d9c86b71264307971f27e2cecb2a4d17d94.tar.gz | |
ChangeLogTag: Thu Jun 16 18:54:01 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bdac71abde6..2c2ac5d457a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Jun 16 18:54:01 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_codegen.cpp: + + Added conditional (for HPUX compiler only) code generation of + include of ace/SString.h in the stub source file, apparently + necessary when the HP compiler has optimize=1. Thanks to + Kris Dekeyser <Kris.Dekeyser@lms.be> for reporting the problem. + Thu Jun 16 17:37:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/TAO_Internal.cpp: diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 2192963b08f..f6c94d77db4 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -311,7 +311,7 @@ TAO_CodeGen::start_client_stubs (const char *fname) << "\""; *this->client_stubs_ << "\n#endif /* !defined INLINE */"; } - + return 0; } @@ -1600,12 +1600,16 @@ TAO_CodeGen::gen_stub_src_includes (void) if (be_global->gen_amh_classes () == I_TRUE) { - *this->client_stubs_ << be_nl; - // Necessary for the AIX compiler. this->gen_standard_include (this->client_stubs_, "ace/Auto_Ptr.h"); } + + // Needed by HPUX when optimize=1. +#if defined (HPUX) + this->gen_standard_include (this->client_stubs_, + "ace/SString.h"); +#endif /* HPUX */ } void |