ChangeLogTag:Wed Jun 12 11:49:33 2002 Steve Huston <shuston@riverace.com>

5 files changed, 36 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index cb0128b9cf9..3b426e495e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jun 12 11:49:33 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Changed to
+          match book.
+
+        * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp (init):
+          Use ACE_Auto_Array_Ptr to be cleaner about allocated char ptr
+          array. Coincides with book change.
+
 Tue Jun 11 10:23:03 2002  Stephen Torri	<storri@cs.wustl.edu>
 
 	* ace/String_Base.h: Updated comments/documentation on the String_Base
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index cb0128b9cf9..3b426e495e7 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Wed Jun 12 11:49:33 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Changed to
+          match book.
+
+        * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp (init):
+          Use ACE_Auto_Array_Ptr to be cleaner about allocated char ptr
+          array. Coincides with book change.
+
 Tue Jun 11 10:23:03 2002  Stephen Torri	<storri@cs.wustl.edu>
 
 	* ace/String_Base.h: Updated comments/documentation on the String_Base
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index cb0128b9cf9..3b426e495e7 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Wed Jun 12 11:49:33 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Changed to
+          match book.
+
+        * examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp (init):
+          Use ACE_Auto_Array_Ptr to be cleaner about allocated char ptr
+          array. Coincides with book change.
+
 Tue Jun 11 10:23:03 2002  Stephen Torri	<storri@cs.wustl.edu>
 
 	* ace/String_Base.h: Updated comments/documentation on the String_Base
diff --git a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
index 82dcdc73b1d..9c34a36cc22 100644
--- a/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/AC_Client_Logging_Daemon.cpp
@@ -183,7 +183,7 @@ int AC_Output_Handler::open (void *connector) {
        (this, ACE_Event_Handler::READ_MASK) == -1)
     return -1;
   if (msg_queue ()->activate ()
-      == ACE_Message_Queue_Base::WAS_ACTIVATED) {
+      == ACE_Message_Queue_Base::ACTIVATED) {
     msg_queue ()->high_water_mark (QUEUE_MAX);
     return activate (THR_SCOPE_SYSTEM);
   } else return 0;
diff --git a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp
index c01c42c15ec..a548612630e 100644
--- a/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp
+++ b/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp
@@ -8,21 +8,21 @@
 #define _REACTOR_LOGGING_SERVER_ADAPTER_C
 
 #include "ace/ACE.h"
+#include "ace/Auto_Ptr.h"
 #include "Reactor_Logging_Server_Adapter.h"
 
 template <class ACCEPTOR> int
 Reactor_Logging_Server_Adapter<ACCEPTOR>::init (int argc,
                                                 ACE_TCHAR *argv[]) {
   int i;
-  const int MAX_ARGS = 10;
-  char *char_argv[MAX_ARGS];
-  for (i = 0; i < argc && i < MAX_ARGS; ++i)
+  ACE_Auto_Array_Ptr<char *> char_argv (new char*[argc]);
+
+  for (i = 0; i < argc; ++i)
     char_argv[i] = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (argv[i]));
-  ACE_NEW_NORETURN (server_,
-                    Reactor_Logging_Server<ACCEPTOR>
-                      (i, char_argv, ACE_Reactor::instance ()));
-  for (i = 0; i < argc && i < MAX_ARGS; ++i)
-    ACE::strdelete (char_argv[i]);
+  ACE_NEW_NORETURN (server_, Reactor_Logging_Server<ACCEPTOR>
+                               (i, char_argv.get (),
+                                ACE_Reactor::instance ()));
+  for (i = 0; i < argc; ++i) ACE::strdelete (char_argv[i]);
   return server_ == 0 ? -1 : 0;
 }