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/RW_Process_Mutex_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/RW_Process_Mutex_Test.cpp')
-rw-r--r-- | ACE/tests/RW_Process_Mutex_Test.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ACE/tests/RW_Process_Mutex_Test.cpp b/ACE/tests/RW_Process_Mutex_Test.cpp index 7c84597df70..960bdae1468 100644 --- a/ACE/tests/RW_Process_Mutex_Test.cpp +++ b/ACE/tests/RW_Process_Mutex_Test.cpp @@ -431,11 +431,6 @@ run_main (int argc, ACE_TCHAR *argv[]) mutex_name.c_str (), ACE_TEXT ("ctor"))); } -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - static const ACE_TCHAR* format = ACE_TEXT ("%ls -c %d -p %u -n %ls"); -#else - static const ACE_TCHAR* format = ACE_TEXT ("%s -c %d -p %u -n %s"); -#endif /* !ACE_WIN32 && ACE_USES_WCHAR */ // The parent process reads time ranges sent from the children via // UDP. Grab an unused UDP port to tell the children to send to. @@ -462,13 +457,12 @@ run_main (int argc, ACE_TCHAR *argv[]) Child *child = (i == 0 ? &writer : &readers[i-1]); ACE_Process_Options options; #ifndef ACE_LACKS_VA_FUNCTIONS - options.command_line (format, + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT (" -c %d -p %u -n %") ACE_TEXT_PRIs, argc > 0 ? argv[0] : ACE_TEXT ("RW_Process_Mutex_Test"), i, (unsigned int)me.get_port_number (), mutex_name.c_str ()); -#else - ACE_UNUSED_ARG (format); #endif if (child->spawn (options) == -1) { |