summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2003-01-23 02:11:36 +0000
committerSteve Huston <shuston@riverace.com>2003-01-23 02:11:36 +0000
commit72fd6bb0aa2561db4b61a49a9944def1250717b8 (patch)
tree44e58fc8daf7758b24ed90c4585595cd6ae73854
parent8df92a95100663a6bc0a681faca7742113aa9c84 (diff)
downloadATCD-72fd6bb0aa2561db4b61a49a9944def1250717b8.tar.gz
ChangeLogTag:Wed Jan 22 21:08:48 2003 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp8
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3512ec7c5bf..fd1579f15a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 22 21:08:48 2003 Steve Huston <shuston@riverace.com>
+
+ * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp (Quit_Handler):
+ Sync with code in the book.
+
Wed Jan 22 18:12:41 2003 Steve Huston <shuston@riverace.com>
* examples/C++NPv2/Service_Reporter.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3512ec7c5bf..fd1579f15a6 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Wed Jan 22 21:08:48 2003 Steve Huston <shuston@riverace.com>
+
+ * examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp (Quit_Handler):
+ Sync with code in the book.
+
Wed Jan 22 18:12:41 2003 Steve Huston <shuston@riverace.com>
* examples/C++NPv2/Service_Reporter.cpp:
diff --git a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
index 82b8a4c6d99..581a73bacfb 100644
--- a/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
+++ b/examples/C++NPv2/WFMO_Reactor_Logging_Server.cpp
@@ -19,15 +19,13 @@ private:
ACE_Manual_Event quit_seen_;
public:
- Quit_Handler (ACE_Reactor *r)
- : ACE_Event_Handler (r) {
+ Quit_Handler (ACE_Reactor *r) : ACE_Event_Handler (r) {
SetConsoleMode (ACE_STDIN, ENABLE_LINE_INPUT
| ENABLE_ECHO_INPUT
| ENABLE_PROCESSED_INPUT);
if (reactor ()->register_handler
- (this, quit_seen_.handle ()) == -1)
- r->end_reactor_event_loop ();
- else if (ACE_Event_Handler::register_stdin_handler
+ (this, quit_seen_.handle ()) == -1)
+ || ACE_Event_Handler::register_stdin_handler
(this, r, ACE_Thread_Manager::instance ()) == -1)
r->end_reactor_event_loop ();
}