diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-17 13:29:11 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-17 13:29:11 +0000 |
| commit | 939916bda1113594cc5bafd64548e9bddc2174ec (patch) | |
| tree | 587dda08183deb9443bb28256a618983de9c37bb | |
| parent | ab9f319faaac387ba11f4e3da33ace65fafbf5ff (diff) | |
| download | ATCD-939916bda1113594cc5bafd64548e9bddc2174ec.tar.gz | |
ChangeLogTag: Wed Aug 17 13:27:16 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 18 |
2 files changed, 23 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 457ec6f512c..01d1b611343 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Aug 17 13:27:16 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_codegen.cpp: + + In generating the include of *C.h in *A.h, added generation + of the prefix "tao/" if we are processing a .pidl file, since + in that case, the *A.h file will not be in the same directory. + Wed Aug 17 12:39:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp: diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 86b26ddc674..2153596ddb1 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -784,9 +784,21 @@ TAO_CodeGen::start_anyop_header (const char *fname) << "\""; } + char *tao_prefix = ""; + ACE_CString pidl_checker (idl_global->filename ()->get_string ()); + bool got_pidl = + (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl"); + + // If we're here and we have a .pidl file, we need to generate + // the *A.h include from the AnyTypeCode library. + if (got_pidl) + { + tao_prefix = "tao/"; + } + // Generate the include statement for the client header. We just // need to put only the base names. Path info is not required. - *this->anyop_header_ << "\n#include \"" + *this->anyop_header_ << "\n#include \"" << tao_prefix << be_global->be_get_client_hdr_fname () << "\""; @@ -807,7 +819,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) ACE_CString pidl_checker (idl_name); bool got_pidl = - (pidl_checker.find (".pidl") != ACE_SString::npos); + (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl"); // If we're here and we have a .pidl file, we need to generate // the *A.h include from the AnyTypeCode library. @@ -1542,7 +1554,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void) ACE_CString pidl_checker (idl_name); bool got_pidl = - (pidl_checker.find (".pidl") != ACE_SString::npos); + (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl"); // If we're here and we have a .pidl file, we need to generate // the *A.h include from the AnyTypeCode library. |