diff options
| author | Olli Savia <ops@iki.fi> | 2009-10-27 19:36:18 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2009-10-27 19:36:18 +0000 |
| commit | d149f88bca6be29ba8b564a866faf93cf5ac1c65 (patch) | |
| tree | 3a0c4eca1325bd7f4f3db0c560eb8936151a306c | |
| parent | cee24c72b05eaa9e3a6c141483077b09f7a53a5a (diff) | |
| download | ATCD-d149f88bca6be29ba8b564a866faf93cf5ac1c65.tar.gz | |
ChangeLogTag: Tue Oct 27 19:35:06 UTC 2009 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/tests/OS_Test.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3f6f0fda7a7..0e8f9a863fa 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 27 19:35:06 UTC 2009 Olli Savia <ops@iki.fi> + + * tests/OS_Test.cpp: + Fixed wrong logic with macros + Thu Oct 22 21:12:21 UTC 2009 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Pipe.h (ACE_Pipe): Updated the document to correct a typo. diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 8887c94fdd4..0627b509b06 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -105,13 +105,12 @@ fileno_test (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("fileno(stdout) returned -2.\n"))); } else -#else +#endif if (fn != ACE_STDOUT) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("stdout test failed.\n"))); test_status = -1; } -#endif fn = ACE_OS::fileno (stderr); if (fn == ACE_INVALID_HANDLE) @@ -128,13 +127,12 @@ fileno_test (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("fileno(stderr) returned -2.\n"))); } else -#else +#endif if (fn != ACE_STDERR) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("stderr test failed.\n"))); test_status = -1; } -#endif return test_status; } |