diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2022-10-11 15:52:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-11 15:52:48 -0500 |
| commit | f63ede24b58993e439c94cf8a3b01773debfba17 (patch) | |
| tree | 30e0d1568d39ca73295d80edf9bce65426adba83 /ACE/tests/MEM_Stream_Test.cpp | |
| parent | 1bff842cc585cbad02f265371674f83016b174dd (diff) | |
| parent | bdde15c15c34f8b4fb04823d2c1ca43a66a5d59d (diff) | |
| download | ATCD-f63ede24b58993e439c94cf8a3b01773debfba17.tar.gz | |
Merge pull request #1948 from mitza-oci/a6t2-merge
[ACE6-TAO2] Merge selected recent changes from ACE7-TAO3
Diffstat (limited to 'ACE/tests/MEM_Stream_Test.cpp')
| -rw-r--r-- | ACE/tests/MEM_Stream_Test.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp index 0819d766df4..940e0dd4088 100644 --- a/ACE/tests/MEM_Stream_Test.cpp +++ b/ACE/tests/MEM_Stream_Test.cpp @@ -281,12 +281,7 @@ test_reactive (const ACE_TCHAR *prog, ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()"))); #else ACE_Process_Options opts; -# if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -r"); -# else - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -r"); -# endif /* ACE_WIN32 || !ACE_USES_WCHAR */ - opts.command_line (cmdline_fmt, prog, sport); + opts.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -p%d -r"), prog, sport); if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_REACTIVE_CONNECTIONS, opts) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n ()"))); @@ -372,12 +367,7 @@ test_concurrent (const ACE_TCHAR *prog, ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()"))); #else ACE_Process_Options opts; -# if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%s -p%d -m"); -# else - const ACE_TCHAR *cmdline_fmt = ACE_TEXT ("%ls -p%d -m"); -# endif /* ACE_WIN32 || !ACE_USES_WCHAR */ - opts.command_line (cmdline_fmt, prog, sport); + opts.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -p%d -m"), prog, sport); if (ACE_Process_Manager::instance ()->spawn_n (NUMBER_OF_MT_CONNECTIONS, opts) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn_n()"))); |