summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2013-04-15 14:29:40 +0000
committerSteve Huston <shuston@riverace.com>2013-04-15 14:29:40 +0000
commit324b0d06279586cbb32b34f598a8dc18b84ca855 (patch)
treea83207a79a4d12405755be4fd4e191def617d858 /ACE
parent9b5e0ec77beced94c974bfb27a027baa46a3a271 (diff)
downloadATCD-324b0d06279586cbb32b34f598a8dc18b84ca855.tar.gz
ChangeLogTag:Mon Apr 15 14:28:43 UTC 2013 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog4
-rw-r--r--ACE/ace/Dev_Poll_Reactor.cpp6
2 files changed, 7 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 49304b9bcc6..757c70e0259 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 15 14:28:43 UTC 2013 Steve Huston <shuston@riverace.com>
+
+ * ace/Dev_Poll_Reactor.cpp: Fixed single-threaded build issues.
+
Mon Apr 15 13:59:55 UTC 2013 Adam Mitz <mitza@ociweb.com>
* ace/Log_Record.inl:
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index d2091a22de8..a37903f0184 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -1555,7 +1555,7 @@ ACE_Dev_Poll_Reactor::remove_handler (ACE_Event_Handler *handler,
{
ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler");
- ACE_MT (ACE_GUARD_RETURN (ACE_DEV_POLL_TOKEN, grd, this->repo_token_, -1));
+ ACE_GUARD_RETURN (ACE_DEV_POLL_TOKEN, grd, this->repo_token_, -1);
return this->remove_handler_i (handler->get_handle (), mask, grd);
}
@@ -1565,7 +1565,7 @@ ACE_Dev_Poll_Reactor::remove_handler (ACE_HANDLE handle,
{
ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler");
- ACE_MT (ACE_GUARD_RETURN (ACE_DEV_POLL_TOKEN, grd, this->repo_token_, -1));
+ ACE_GUARD_RETURN (ACE_DEV_POLL_TOKEN, grd, this->repo_token_, -1);
return this->remove_handler_i (handle, mask, grd);
}
@@ -1624,7 +1624,7 @@ ACE_Dev_Poll_Reactor::remove_handler (const ACE_Handle_Set &handle_set,
h != ACE_INVALID_HANDLE;
h = handle_iter ())
{
- ACE_MT (ACE_GUARD_RETURN (ACE_DEV_POLL_TOKEN, grd, this->repo_token_, -1));
+ ACE_GUARD_RETURN (ACE_DEV_POLL_TOKEN, grd, this->repo_token_, -1);
if (this->remove_handler_i (h, mask, grd) == -1)
return -1;
}