summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2013-04-15 14:32:05 +0000
committerSteve Huston <shuston@riverace.com>2013-04-15 14:32:05 +0000
commit17de454ae447f29c05800dc1b21d831c7572003f (patch)
tree8c04dee9765bc0f0bc1a9ae1e55dedab628457b7
parent9541a6b7eb231ae72d5d031b10b83b48747d1fbd (diff)
downloadATCD-17de454ae447f29c05800dc1b21d831c7572003f.tar.gz
ChangeLogTag:Mon Apr 15 14:28:43 UTC 2013 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog4
-rw-r--r--ace/Dev_Poll_Reactor.cpp6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fe28e52c2b9..2cadbfde3f5 100644
--- a/ChangeLog
+++ b/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.
+
Fri Apr 12 19:49:50 UTC 2013 Steve Huston <shuston@riverace.com>
* ace/Dev_Poll_Reactor.cpp:
diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp
index 4ddd1c0e4ee..d385330894f 100644
--- a/ace/Dev_Poll_Reactor.cpp
+++ b/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;
}