diff options
author | Erik Sohns <erik.sohns@posteo.de> | 2023-04-05 17:37:54 +0200 |
---|---|---|
committer | Erik Sohns <erik.sohns@posteo.de> | 2023-04-05 17:37:54 +0200 |
commit | 761e24b54d7fda41ed58a6e2f41ba905e43bf3d9 (patch) | |
tree | 69171a8ba215e125cf273ab6bbe4641313df6e6a /TAO/TAO_IDL/fe/idl.yy.cpp | |
parent | 3e44fb91cf724aeb48b38169482a4878de316afc (diff) | |
parent | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (diff) | |
download | ATCD-761e24b54d7fda41ed58a6e2f41ba905e43bf3d9.tar.gz |
Merge branch 'message_queue_ex_get_queue' of https://github.com/esohns/ACE_TAO into message_queue_ex_get_queue
Diffstat (limited to 'TAO/TAO_IDL/fe/idl.yy.cpp')
-rw-r--r-- | TAO/TAO_IDL/fe/idl.yy.cpp | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index 566e026cb55..e5546389c91 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -288,7 +288,7 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L || defined (__HP_aCC) +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -3644,20 +3644,6 @@ idl_parse_line_and_file (char *buf) } h[i] = '\0'; -#if defined (ACE_OPENVMS) - // translate this into *nix format as the OpenVMS preprocessor - // possibly produced VMS-style paths here. - char trans_path[MAXPATHLEN] = ""; - char *temp_h = IDL_GlobalData::translateName (h, trans_path); - if (temp_h) - h = temp_h; - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Unable to construct full file pathname\n"))); - throw Bailout (); - } -#endif ACE_NEW (tmp, UTL_String (h, true)); idl_global->update_prefix (tmp->get_string ()); @@ -3676,21 +3662,10 @@ idl_parse_line_and_file (char *buf) if (!is_real_filename) { -#if defined (ACE_OPENVMS) - char full_path[MAXPATHLEN] = ""; - char *full_fname = ACE_OS::realpath (fname->get_string (), full_path); - // I don't see the benefit of using ->compare since this is targeted at IDL identifiers - // not at filenames and in the case of OpenVMS (case-insensitive filesystem) gets really - // problematic as filenames retrieved through different mechanisms may give different - // casing. - is_main_filename = FE_Utils::path_cmp (idl_global->main_filename ()->get_string (), - full_fname) == 0; -#else is_main_filename = fname->compare (idl_global->main_filename ()) || same_file (fname->get_string (), idl_global->main_filename ()->get_string ()); -#endif } if (is_real_filename || is_main_filename) |