diff options
author | Adam Mitz <mitza@objectcomputing.com> | 2021-01-21 08:42:34 -0600 |
---|---|---|
committer | Adam Mitz <mitza@objectcomputing.com> | 2021-01-21 08:42:34 -0600 |
commit | feeb5de56328cb3fbe237ed010264f8c3ac5ca7f (patch) | |
tree | c719bb85420a0037d39585c59924618608b4cf35 | |
parent | 917877aab4ea4fa06de98470fd6724d0f7d28b7b (diff) | |
parent | faab6830cf4ecf67b452183dba712caae7996be4 (diff) | |
download | ATCD-feeb5de56328cb3fbe237ed010264f8c3ac5ca7f.tar.gz |
Merge branch 'testing' into taoidl-tao3
# Conflicts:
# TAO/TAO_IDL/driver/drv_preproc.cpp
-rw-r--r-- | TAO/TAO_IDL/driver/drv_preproc.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 3e02a5c4ac1..1943bbdf9d3 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -138,7 +138,7 @@ DRV_cpp_putarg (const char *str) throw Bailout (); } - if (str && ACE_OS::strchr (str, ' ')) + if (str && ACE_OS::strchr (str, ' ') && !ACE_OS::strchr (str, '"')) { ACE_TCHAR *buf = nullptr; ACE_NEW_NORETURN (buf, ACE_TCHAR[ACE_OS::strlen (str) + 3]); @@ -962,7 +962,7 @@ DRV_copy_input (FILE *fin, if (f == nullptr) { ACE_ERROR ((LM_ERROR, - "%C: cannot open temp file \"%C\" for copying from \"%C\": %p\n", + "%C: cannot open temp file \"%C\" for copying from \"%C\": %m\n", idl_global->prog_name (), fn, orig_filename)); @@ -1095,7 +1095,7 @@ DRV_pre_proc (const char *myfile) if (ti_fd == ACE_INVALID_HANDLE) { ACE_ERROR ((LM_ERROR, - "%C: Unable to create temporary file \"%C\": %p\n", + "%C: Unable to create temporary file \"%C\": %m\n", idl_global->prog_name (), tmp_ifile)); @@ -1107,7 +1107,7 @@ DRV_pre_proc (const char *myfile) if (tf_fd == ACE_INVALID_HANDLE) { ACE_ERROR ((LM_ERROR, - "%C: Unable to create temporary file \"%C\": %p\n", + "%C: Unable to create temporary file \"%C\": %m\n", idl_global->prog_name (), tmp_file)); @@ -1137,7 +1137,7 @@ DRV_pre_proc (const char *myfile) if (file == nullptr) { ACE_ERROR ((LM_ERROR, - "%C: ERROR: Unable to open file : %p\n", + "%C: ERROR: Unable to open file : %m\n", idl_global->prog_name (), myfile)); @@ -1236,7 +1236,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Unable to rename temporary " - "file \"%C\" to \"%C\": %p\n", + "file \"%C\" to \"%C\": %m\n", idl_global->prog_name (), tmp_file, t_file)); @@ -1251,7 +1251,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Unable to rename temporary " - "file \"%C\" to \"%C\": %p\n", + "file \"%C\" to \"%C\": %m\n", idl_global->prog_name (), tmp_ifile, t_ifile)); @@ -1287,7 +1287,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: cannot open temp file" - " \"%C\" for writing: %p\n", + " \"%C\" for writing: %m\n", idl_global->prog_name (), t_file)); @@ -1298,7 +1298,7 @@ DRV_pre_proc (const char *myfile) if (cpp_options.set_handles (ACE_INVALID_HANDLE, fd) == -1) { - ACE_ERROR ((LM_ERROR, "%C: cannot set stdout for child process: %p\n", + ACE_ERROR ((LM_ERROR, "%C: cannot set stdout for child process: %m\n", idl_global->prog_name ())); throw Bailout (); @@ -1331,7 +1331,7 @@ DRV_pre_proc (const char *myfile) if (ACE_OS::close (fd) == -1) { ACE_ERROR ((LM_ERROR, - "%C: cannot close temp file \"%C\" on parent: %p\n", + "%C: cannot close temp file \"%C\" on parent: %m\n", idl_global->prog_name (), t_file)); @@ -1410,7 +1410,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not open cpp " - "output file \"%C\": %p\n", + "output file \"%C\": %m\n", idl_global->prog_name (), t_file)); @@ -1431,7 +1431,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not open cpp " - "output file \"$C\": %p\n", + "output file \"%C\": %m\n", idl_global->prog_name (), t_file)); @@ -1467,7 +1467,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not remove cpp " - "input file \"%C\": %p\n", + "input file \"%C\": %m\n", idl_global->prog_name (), t_ifile)); @@ -1478,7 +1478,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not remove cpp " - "output file \"%C\": %p\n", + "output file \"%C\": %m\n", idl_global->prog_name (), t_file)); |