diff options
Diffstat (limited to 'TAO/TAO_IDL/driver/drv_preproc.cpp')
| -rw-r--r-- | TAO/TAO_IDL/driver/drv_preproc.cpp | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index bf9c2d1bd76..9c231e8997c 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -423,32 +423,14 @@ DRV_check_for_include (const char* buf) // Terminate this string. file_name [i] = '\0'; - - size_t len = ACE_OS::strlen (file_name); - // Some backends pass this file through, others don't. + // Store in the idl_global, unless it's "orb.idl" - + // we don't want to generate header includes for that. if (ACE_OS::strcmp (file_name, "orb.idl") == 0) { - if (idl_global->pass_orb_idl ()) - { - idl_global->add_to_included_idl_files (file_name); - } - else - { - DRV_get_orb_idl_includes (); - } - } - // We have special lookup for orb.idl (TAO_ROOT/tao) that - // also kicks in for .pidl files. If one of the latter is - // included as a local name only, we add the 'tao/' prefix - // so the generated C++ include files will be correct. - else if (ACE_OS::strcmp (file_name + len - 5, ".pidl") == 0 - && ACE_OS::strchr (file_name, '/') == 0 - && ACE_OS::strchr (file_name, '\\') == 0) - { - ACE_CString fixed_name ("tao/"); - fixed_name += file_name; - idl_global->add_to_included_idl_files (fixed_name.rep ()); + // However, we do want to generate includes for the + // .pidl files that it contains. + DRV_get_orb_idl_includes (); } else { |