*** empty log message ***

6 files changed, 57 insertions, 46 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index 3f40ccf9789..c3d7e2d4c4f 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,8 @@
+Wed Jul 29 23:58:04 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* examples/Reactor/Ntalker: Added a README file and made some
+ 	  stylistic changes to the ntalker.cpp example.
+
 Wed Jul 29 18:38:17 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.5.25 released.
diff --git a/README b/README
index 6c8a4fc2ab7..2267af6766e 100644
--- a/README
+++ b/README
@@ -591,6 +591,7 @@ Kevin Stanley <kstanley1@mdc.com>
 Jeff Greif <jmg@trivida.com> 
 Avi Nash <anash@RedBrick.COM>
 Jeff McDaniel <jsmcdani@gte.net>
+Andreas Geisler <andreas.geisler@erls.siemens.de>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson and is now at ObjectSpace.  Paul devised the recursive
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 3be666e25dc..812a45636df 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,18 @@
+Thu Jul 30 00:39:10 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* orbsvcs/tests/Concurrency/{CC_command.tab,lex.CC_command}.cpp.diff:
+ 	  Updated these files to prevent complains from lex and yacc.
+  	  Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com>
+ 	  for reporting this fix.
+
+Wed Jul 29 18:46:46 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
+
+        * orbsvcs/tests/Concurrency: Touched the lex and yacc files so
+ 	  that Make won't try to remake their *.cpp files.  This is just a
+ 	  temporary fix until we get this working correctly.  Thanks to
+ 	  J. Russell Noseworthy <rnosewor@objectsciences.com> for
+ 	  reporting this and to Carlos for suggesting the fix.
+
 Wed Jul 29 18:46:46 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * TAO version 0.2 released.
@@ -47,7 +62,7 @@ Wed Jul 29 08:58:01 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
         but not the inline file and the implementation file. The visitor
         that does this was already done, but it was not getting
         invoked. Thanks to Andreas Geisler
-        (andreas.geisler@erls.siemens.de) for reporting this problem.
+        <andreas.geisler@erls.siemens.de> for reporting this problem.
 
 Wed Jul 29 06:45:54 1998  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff
index 786b68a9afb..2f30e28750a 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp.diff
@@ -15,15 +15,6 @@
  
  #ifdef __cplusplus
  
-@@ -240,7 +240,7 @@
-  * Copyright (c) 1993 by Sun Microsystems, Inc.
-  */
- 
--#pragma ident	"@(#)yaccpar	6.12	93/06/07 SMI"
-+/* #pragma ident	"@(#)yaccpar	6.12	93/06/07 SMI" */
- 
- /*
- ** Skeleton parser driver for yacc output
 @@ -303,7 +303,7 @@
  #define ACE_CC_YYLEX()		ace_cc_yycvtok(ace_cc_yylex())
  /*
diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff
index 5144d9a7310..b6693643ce7 100644
--- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff
+++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff
@@ -1,15 +1,5 @@
 --- lex.CC_command.cpp.orig	Fri Jun 19 16:04:06 1998
 +++ lex.CC_command.cpp	Fri Jun 19 16:04:24 1998
-@@ -1,7 +1,7 @@
- /* A lexical scanner generated by flex */
--
-+// $Id$
- /* Scanner skeleton version:
-- * $Header$
-+ * Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp
-  */
- 
- #define FLEX_SCANNER
 @@ -709,110 +709,110 @@
  ACE_CC_YY_RULE_SETUP
  #line 30 "CC_command.l"
diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp
index 05be803c3c7..24cb84e43d9 100644
--- a/examples/Reactor/Ntalker/ntalker.cpp
+++ b/examples/Reactor/Ntalker/ntalker.cpp
@@ -34,15 +34,23 @@ public:
   ~Handler (void);
   // Destructor.
 
-  // Event demuxer.
+  // Event demuxer hooks.
   virtual int handle_input (ACE_HANDLE);
   virtual int handle_close (ACE_HANDLE,
                             ACE_Reactor_Mask);
+  virtual ACE_HANDLE get_handle (void) const;
 
 private:
   ACE_SOCK_Dgram_Mcast mcast_;
+  // Multicast wrapper.
 };
 
+ACE_HANDLE
+Handler::get_handle (void) const
+{
+  return this->mcast_.get_handle ();
+}
+
 int
 Handler::handle_input (ACE_HANDLE h)
 {
@@ -67,7 +75,10 @@ Handler::handle_input (ACE_HANDLE h)
                                "can't read from STDIN"),
                               -1);
       else // result == 0
-        ACE_Reactor::end_event_loop ();
+        {
+          ACE_Reactor::end_event_loop ();
+          return -1;
+        }
     }
   else
     {
@@ -102,11 +113,19 @@ int
 Handler::handle_close (ACE_HANDLE h, ACE_Reactor_Mask)
 {
   if (h == ACE_STDIN)
-    ACE_DEBUG ((LM_DEBUG,
-                "STDIN_Events handle removed from reactor."));
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "STDIN_Events handle removed from reactor.\n"));
+      if (ACE_Reactor::instance ()->remove_handler 
+          (this, ACE_Event_Handler::READ_MASK) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "remove_handler"),
+                           -1);
+    }
   else
     ACE_DEBUG ((LM_DEBUG,
-                "Mcast_Events handle removed from reactor."));
+                "Mcast_Events handle removed from reactor.\n"));
   return 0;
 }
 
@@ -139,12 +158,19 @@ Handler::Handler (u_short udp_port,
   //   ACE_OS::perror (" can't disable loopbacks " ), ACE_OS::exit (1);
 
   // Register callbacks with the ACE_Reactor.
-  if (reactor.register_handler (this->mcast_.get_handle (),
-				this,
-				ACE_Event_Handler::READ_MASK) == -1)
+  else if (reactor.register_handler (this->mcast_.get_handle (),
+                                     this,
+                                     ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR ((LM_ERROR, 
                 "%p\n",
                 "can't register with Reactor\n"));
+  // Register the STDIN handler.
+  else if (ACE::register_stdin_handler (this,
+                                        ACE_Reactor::instance (),
+                                        ACE_Thread_Manager::instance ()) == -1)
+      ACE_ERROR ((LM_ERROR,
+                  "%p\n",
+                  "register_stdin_handler"));
 }
 
 static void
@@ -180,28 +206,11 @@ main (int argc, char *argv[])
                    INTERFACE,
                    *ACE_Reactor::instance ());
 
-  // Register the STDIN handler.
-  if (ACE::register_stdin_handler (&handler,
-                                   ACE_Reactor::instance (),
-                                   ACE_Thread_Manager::instance ()) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "register_stdin_handler"),
-                        -1);
-
   // Run the event loop.
   ACE_Reactor::run_event_loop ();
 
   ACE_DEBUG ((LM_DEBUG,
-              "\ntalker Done.\n"));
-
-  // Cleanup the STDIN handler.
-  if (ACE::remove_stdin_handler (ACE_Reactor::instance (),
-                                 ACE_Thread_Manager::instance ()) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "remove_stdin_handler"),
-                        -1);
+              "talker Done.\n"));
   return 0;
 }
 #else