summaryrefslogtreecommitdiff
path: root/ACE/ace/Proactor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/Proactor.cpp')
-rw-r--r--ACE/ace/Proactor.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index b757b43e27f..11292eb1169 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -18,7 +18,7 @@
#include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
+#include "ace/Log_Category.h"
#include "ace/Framework_Component.h"
#if defined (ACE_HAS_AIO_CALLS)
@@ -168,7 +168,7 @@ ACE_Proactor_Timer_Handler::svc (void)
break;
default:
// Error.
- ACE_ERROR_RETURN ((LM_ERROR,
+ ACELIB_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
ACE_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")),
-1);
@@ -224,7 +224,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &,
const ACE_Time_Value &time)
{
if (this->proactor_ == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
+ ACELIB_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,")
ACE_TEXT (" no completion port to post timeout to?!@\n")),
-1);
@@ -239,7 +239,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &,
-1);
if (asynch_timer == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
+ ACELIB_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:")
ACE_TEXT ("create_asynch_timer failed")),
@@ -250,7 +250,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &,
// Post a completion.
if (-1 == safe_asynch_timer->post_completion
(this->proactor_->implementation ()))
- ACE_ERROR_RETURN ((LM_ERROR,
+ ACELIB_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("Failure in dealing with timers: ")
ACE_TEXT ("PostQueuedCompletionStatus failed\n")),
-1);
@@ -300,7 +300,7 @@ ACE_Proactor_Handle_Timeout_Upcall::proactor (ACE_Proactor &proactor)
return 0;
}
else
- ACE_ERROR_RETURN ((LM_ERROR,
+ ACELIB_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall is only suppose")
ACE_TEXT (" to be used with ONE (and only one) Proactor\n")),
-1);
@@ -358,7 +358,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
// Activate <timer_handler>.
if (this->timer_handler_->activate () == -1)
- ACE_ERROR ((LM_ERROR,
+ ACELIB_ERROR ((LM_ERROR,
ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
ACE_TEXT ("Task::activate:could not create thread\n")));
}
@@ -613,7 +613,7 @@ ACE_Proactor::close (void)
{
// Close the implementation.
if (this->implementation ()->close () == -1)
- ACE_ERROR ((LM_ERROR,
+ ACELIB_ERROR ((LM_ERROR,
ACE_TEXT ("%N:%l:(%P | %t):%p\n"),
ACE_TEXT ("ACE_Proactor::close: implementation close")));