diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-05-24 14:33:30 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-05-24 14:33:30 +0000 |
| commit | de0e27614c8ff4090bf6be6959b06293c864ed0c (patch) | |
| tree | f209e8aabe44201d7207a53040b271c0cb2fd1d8 | |
| parent | 0baff9804a9268a5e5339c70f99c0678815cc308 (diff) | |
| download | ATCD-de0e27614c8ff4090bf6be6959b06293c864ed0c.tar.gz | |
ChangeLogTag: Tue May 24 09:31:42 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/acedefaults.mpb | 2 | ||||
| -rw-r--r-- | tests/Pipe_Test.cpp | 2 | ||||
| -rw-r--r-- | tests/Process_Mutex_Test.cpp | 4 |
4 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index a889e60c686..734a00d2b09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,29 @@ +Tue May 24 09:31:42 2005 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/config/acedefaults.mpb: + + Use $(ILIBMODIFIER) instead of $(LIBMODIFIER). + + * tests/Pipe_Test.cpp: + * tests/Process_Mutex_Test.cpp: + + Added missing ACE_TEXT () around option strings. This was causing + a very strange file to show up after the Process_Mutex_Test was + run in the Borland unicode build and the Pipe_Test didn't run at + all. + Tue May 24 00:17:09 2005 Emre Turkay <turkaye@dre.vanderbilt.edu> * bin/MakeProjectCreator/config/cidlc.mpb: - Created a base project for cidlc & ccf project files. + Created a base project for cidlc & ccf project files. Tue May 24 07:58:09 2005 Olli Savia <ops@iki.fi> * ace/SSL/SSL_SOCK_Stream.h: Added include "ace/os_include/os_stdio.h" to fix compile problem on LynxOS. Thanks to Christine Ballard - <christine.ballard at lmco dot com> for reporting the problem. + <christine.ballard at lmco dot com> for reporting the problem. Mon May 23 23:11:14 2005 Emre Turkay <turkaye@dre.vanderbilt.edu> diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb index 69172c0d706..33ea9e4aada 100644 --- a/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/bin/MakeProjectCreator/config/acedefaults.mpb @@ -9,7 +9,7 @@ project: zzip { // Support the alternative Borland Make project type specific(bmake) { unicode_flags += -DACE_USES_WCHAR - macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIBMODIFIER)\\") + macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(ILIBMODIFIER)\\") debug_macros += ACE_NO_INLINE=1 } diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index f1d7792eb80..71812dc1b80 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -105,7 +105,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_Process_Options options; options.command_line (ACE_TEXT ("%s -c%s"), argv[0], - close_pipe == 0 ? " -d" : ""); + close_pipe == 0 ? ACE_TEXT (" -d") : ACE_TEXT ("")); ACE_exitcode status = 0; diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index cdf1c85180c..2c604618328 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -153,13 +153,13 @@ run_main (int argc, ACE_TCHAR *argv[]) # endif #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - static const ACE_TCHAR* format = ACE_TEXT ("%ls -c -n %ls%s"); + static const ACE_TCHAR* format = ACE_TEXT ("%ls -c -n %ls%ls"); #else static const ACE_TCHAR* format = ACE_TEXT ("%s -c -n %s%s"); #endif /* !ACE_WIN32 && ACE_USES_WCHAR */ ACE_Process_Options options; options.command_line (format, argv[0], mutex_name, - release_mutex == 0 ? " -d" : ""); + release_mutex == 0 ? ACE_TEXT (" -d") : ACE_TEXT ("")); // Spawn <n_processes> child processes that will contend for the // lock. |