diff options
| author | Luke Mewburn <Luke@Mewburn.net> | 2022-09-10 16:30:54 +1000 |
|---|---|---|
| committer | Luke Mewburn <Luke@Mewburn.net> | 2022-09-10 16:30:54 +1000 |
| commit | 2be659384defe6b235e020f03a7d683c80a16c7e (patch) | |
| tree | c617213074082f7665abbcbb990123755c3d8ed1 /ACE/tests/MEM_Stream_Test.cpp | |
| parent | f5e5d7759a9314053509d294a4c10827d3946034 (diff) | |
| download | ATCD-2be659384defe6b235e020f03a7d683c80a16c7e.tar.gz | |
Adapt to ACE_TEXT_PRIs
Use ACE_TEXT_PRIs instead of conditional compilation
checking !defined(ACE_WIN32) && defined(ACE_USES_WCHAR).
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 8cc11482e4a..56e7d629cd6 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()"))); |