diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-21 06:02:48 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-04-21 06:02:48 +0000 |
| commit | 7d16af28e9b0b22d8bdea0cd8081899481dd4716 (patch) | |
| tree | 01ce73adacfc61d723dbc1c33f15c8cd99f450ac | |
| parent | 51671059d67a1a1c42bcb0cc48efd6be7f3bd825 (diff) | |
| download | ATCD-7d16af28e9b0b22d8bdea0cd8081899481dd4716.tar.gz | |
Tue Apr 21 07:02:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/OS/Process/imore.cpp:
* tests/Recursive_Mutex_Test.cpp:
Fixed cegcc warning
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/examples/OS/Process/imore.cpp | 6 | ||||
| -rw-r--r-- | ACE/tests/Recursive_Mutex_Test.cpp | 6 | ||||
| -rw-r--r-- | ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index d29593422cd..9b787fa1d4a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 21 07:02:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/OS/Process/imore.cpp: + * tests/Recursive_Mutex_Test.cpp: + Fixed cegcc warning + Mon Apr 20 20:01:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_string.cpp: diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp index e6c672d949f..a22ceb2e9f3 100644 --- a/ACE/examples/OS/Process/imore.cpp +++ b/ACE/examples/OS/Process/imore.cpp @@ -94,6 +94,7 @@ parse_args (int argc, ACE_TCHAR **argv) return 0; } +#if !defined (ACE_WIN32) static int setup_named_pipes (ACE_Process_Options &opt) { @@ -142,7 +143,9 @@ setup_named_pipes (ACE_Process_Options &opt) wfifo.close (); return 0; } +#endif +#if !defined (ACE_WIN32) static int setup_unnamed_pipe (ACE_Process_Options &opt) { @@ -169,6 +172,7 @@ setup_unnamed_pipe (ACE_Process_Options &opt) pipe.close (); return 0; } +#endif static int print_file (ACE_HANDLE infd) @@ -193,7 +197,7 @@ print_file (ACE_HANDLE infd) } } } - + return 0; } diff --git a/ACE/tests/Recursive_Mutex_Test.cpp b/ACE/tests/Recursive_Mutex_Test.cpp index fafe771551a..6d37316f314 100644 --- a/ACE/tests/Recursive_Mutex_Test.cpp +++ b/ACE/tests/Recursive_Mutex_Test.cpp @@ -54,7 +54,9 @@ static size_t n_threads = ACE_MAX_THREADS; // ACE_Recursive_Thread_Mutex::get_nesting_level() will return a // meaningful value. +#if !defined (ACE_HAS_WTHREADS) static bool nesting_level_supported = false; +#endif static void test_recursion_depth (int nesting_level, @@ -94,7 +96,7 @@ test_recursion_depth (int nesting_level, test_recursion_depth (nesting_level + 1, rm); -#if !defined (ACE_HAS_WTHREADS) +#if !defined (ACE_HAS_WTHREADS) if (nesting_level_supported && (nesting_level + 1) != rm->get_nesting_level ()) { @@ -364,7 +366,7 @@ run_main (int argc, ACE_TCHAR *argv[]) #if !defined (ACE_HAS_WTHREADS) // This will work for Windows, too, if ACE_TEST_MUTEX is // ACE_Recursive_Thread_Mutex instead of ACE_Process_Mutex. - nesting_level_supported = + nesting_level_supported = (rm.get_nesting_level () != -1 || errno != ENOTSUP); #endif /* !ACE_HAS_WTHREADS */ diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index a2cbb5569d7..1bfbfc4b7e8 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -196,7 +196,7 @@ Request_Handler::handle_input (ACE_HANDLE fd) else { ACE_DEBUG ((LM_DEBUG, - "(%t) Errno is %d and result is %d\n", + "(%t) Errno is %d and result is %d\n", errno, result)); ACE_DEBUG ((LM_DEBUG, "(%t) Request_Handler: 0x%x peer closed (0x%x)\n", |