diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-04-08 08:24:26 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-04-08 08:24:26 +0000 |
| commit | d5509b9c8dcecba99cc79aa35e3cae06f3ab65df (patch) | |
| tree | b783e58f10db470c6304238443394d56934dd1e2 | |
| parent | b1fd6f01f1e2a58d240187b14629faeda53381fc (diff) | |
| download | ATCD-d5509b9c8dcecba99cc79aa35e3cae06f3ab65df.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ace/Log_Msg.cpp | 4 | ||||
| -rw-r--r-- | ace/OS.i | 8 | ||||
| -rw-r--r-- | tests/Conn_Test.cpp | 10 | ||||
| -rw-r--r-- | tests/IOStream_Test.cpp | 4 | ||||
| -rw-r--r-- | tests/Timer_Queue_Test.cpp | 3 |
5 files changed, 20 insertions, 9 deletions
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 4201442c8ea..d83cda21e06 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -45,10 +45,10 @@ static ACE_FIFO_Send_Msg message_queue_; ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg) -#if !defined(VXWORKS) +#if !defined (VXWORKS) && defined (ACE_MT_SAFE) static int key_created_ = 0; static ACE_thread_key_t key_; -#endif /* VXWORKS */ +#endif /* !VXWORKS && ACE_MT_SAFE */ // This is only needed here because we can't afford to call // ACE_LOG_MSG->instance() from within ACE_Log_Msg::instance() or else @@ -5080,6 +5080,10 @@ ACE_OS::pwrite (ACE_HANDLE handle, return ::pwrite (handle, buf, nbyte, offset); #endif /* ACE_WIN32 */ #else + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (buf); + ACE_UNUSED_ARG (nbyte); + ACE_UNUSED_ARG (offset); ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAD_P_READ_WRITE */ } @@ -5144,6 +5148,10 @@ ACE_OS::pread (ACE_HANDLE handle, return ::pread (handle, buf, nbyte, offset); #endif /* ACE_WIN32 */ #else + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (buf); + ACE_UNUSED_ARG (nbyte); + ACE_UNUSED_ARG (offset); ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAD_P_READ_WRITE */ } diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index fe05ed3a335..e40398c6c83 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -266,11 +266,11 @@ template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR>; template class ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR>; template class ACE_Message_Queue<ACE_NULL_SYNCH>; template class ACE_Svc_Tuple<Svc_Handler>; -template class ACE_Map_Manager<int, ACE_Svc_Tuple<Svc_Handler> *, ACE_RW_Mutex>; -template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Svc_Handler> *, ACE_RW_Mutex>; -template class ACE_Write_Guard<ACE_RW_Mutex>; -template class ACE_Read_Guard<ACE_RW_Mutex>; -template class ACE_Guard<ACE_RW_Mutex>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<Svc_Handler> *, ACE_Null_Mutex>; +template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Svc_Handler> *, ACE_Null_Mutex>; +template class ACE_Write_Guard<ACE_Null_Mutex>; +template class ACE_Read_Guard<ACE_Null_Mutex>; +template class ACE_Guard<ACE_Null_Mutex>; template class ACE_Concurrency_Strategy<Svc_Handler>; template class ACE_TSS<ACE_Dynamic>; template class ACE_Task<ACE_NULL_SYNCH>; diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index ce337eb12ce..f35eb4cd682 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -148,7 +148,7 @@ operator<< (ostream &stream, qchar *buf) // the server. static void * -client (void *arg) +client (void *arg = 0) { ACE_NEW_THREAD; ACE_UNUSED_ARG (arg); @@ -227,7 +227,7 @@ client (void *arg) // begin a two-way conversation. static void * -server (void *) +server (void * = 0) { ACE_NEW_THREAD; diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp index 0c58449e7f0..7cd92fc486f 100644 --- a/tests/Timer_Queue_Test.cpp +++ b/tests/Timer_Queue_Test.cpp @@ -211,6 +211,9 @@ struct Timer_Queues // Name of the Queue that we're testing. }; +// New Timer_Queue implementations should be added to the end of this +// table. + static Timer_Queues timer_queues[] = { { 0, "ACE_Timer_Heap (preallocated)" }, |