diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-10-27 14:23:51 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-10-27 14:23:51 +0000 |
| commit | 1761085cc215bdec452c5dae677b840239ed58e7 (patch) | |
| tree | 7de240abf1a2c2a818f34a1f9241fa73f2472490 /TAO/TAO_IDL | |
| parent | 030d236943ac6832ae9b9c9143dc2aad16f29e5b (diff) | |
| download | ATCD-1761085cc215bdec452c5dae677b840239ed58e7.tar.gz | |
ChangeLogTag: Thu Oct 27 14:20:35 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/TAO_IDL')
| -rw-r--r-- | TAO/TAO_IDL/be/be_global.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 1e2eb10007c..7a2fad72b1b 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -163,17 +163,6 @@ be_change_idl_file_extension (UTL_String* idl_file, return 0; } - // If the included IDL file is from the ORB, ignore any command line - // mods to the header file extension. - if (!for_anyop) - { - if (ACE_OS::strcmp (base, extensions[1]) == 0 - || ACE_OS::strcmp (base, extensions[3]) == 0) - { - new_extension = "C.h"; - } - } - // Anyop file output defaults to general output dir if not set. const char *output_path = (for_anyop ? (be_global->anyop_output_dir () == 0 @@ -230,8 +219,15 @@ const char * BE_GlobalData::be_get_client_hdr (UTL_String *idl_file_name, int base_name_only) { + // User-defined file extensions don't apply to .pidl files. + ACE_CString fn (idl_file_name->get_string ()); + ACE_CString fn_ext = fn.substr (fn.length () - 5); + bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL"); + return be_change_idl_file_extension (idl_file_name, - be_global->client_hdr_ending (), + orb_file + ? "C.h" + : be_global->client_hdr_ending (), base_name_only); } @@ -255,8 +251,15 @@ const char * BE_GlobalData::be_get_server_hdr (UTL_String *idl_file_name, int base_name_only) { + // User-defined file extensions don't apply to .pidl files. + ACE_CString fn (idl_file_name->get_string ()); + ACE_CString fn_ext = fn.substr (fn.length () - 5); + bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL"); + return be_change_idl_file_extension (idl_file_name, - be_global->server_hdr_ending (), + orb_file + ? "S.h" + : be_global->server_hdr_ending (), base_name_only); } |