summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-03-30 21:07:17 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-03-30 21:07:17 +0000
commit70f2c3aa6b474a49e245e8188150536c4ebfa537 (patch)
treef326a1707242cb2cc3f31d83010313ce4760b4c5
parent7eb64111f307ee9463d27ad5cff6565549b76d64 (diff)
downloadATCD-70f2c3aa6b474a49e245e8188150536c4ebfa537.tar.gz
ChangeLogTag: Thu Mar 30 21:03:27 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--ChangeLog22
-rw-r--r--ace/Event_Handler.cpp2
2 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 392bf1dc912..455550f2ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+Thu Mar 30 21:03:27 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * ace/Event_Handler.cpp (read_adapter):
+
+ Fixed typo introduced in
+
+ Thu Mar 30 10:24:50 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu>
+
Thu Mar 30 10:24:50 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu>
- * ace/Event_Handler.cpp (read_adapter): It was possible for
- handle_close() to "delete this" so we need to cache the reactor
- pointer and use it here. Thanks to Yuan <yuanhp_china at
- hotmail dot com> for this fix.
+ * ace/Event_Handler.cpp (read_adapter): It was possible for
+ handle_close() to "delete this" so we need to cache the reactor
+ pointer and use it here. Thanks to Yuan <yuanhp_china at
+ hotmail dot com> for this fix.
Thu Mar 30 18:51:13 UTC 2006 Steve Huston <shuston@riverace.com>
@@ -29,14 +37,14 @@ Thu Mar 30 17:04:48 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu>
* bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
Modified to support CIAO pub/sub service integration.
-
+
* bin/MakeProjectCreator/config/ciao_events_dnc.mpb
-
+
Added this mpb file for pub/sub service integration
in CIAO.
Thu Mar 30 15:45:00 UTC 2006 Simon Massey <sma@prismtech.com>
-
+
* tests/Unload_libACE.cpp:
Corrected missing file handle.
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 0b867291f07..ccbe06b813f 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -254,7 +254,7 @@ ACE_THR_FUNC_RETURN
ACE_Event_Handler::read_adapter (void *args)
{
ACE_Event_Handler *this_ptr = static_cast<ACE_Event_Handler *> (args);
- Ace_Reactor *r = this_ptr->reactor ();
+ ACE_Reactor *r = this_ptr->reactor ();
while (this_ptr->handle_input (ACE_STDIN) != -1)
continue;